|
@ -1,4 +1,96 @@ |
|
|
|
|
|
<<<<<<< HEAD |
|
|
*.DS_Store |
|
|
*.DS_Store |
|
|
|
|
|
======= |
|
|
|
|
|
# General |
|
|
|
|
|
.DS_Store |
|
|
|
|
|
.AppleDouble |
|
|
|
|
|
.LSOverride |
|
|
|
|
|
|
|
|
|
|
|
# Icon must end with two \r |
|
|
|
|
|
Icon |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Thumbnails |
|
|
|
|
|
._* |
|
|
|
|
|
|
|
|
|
|
|
# Files that might appear in the root of a volume |
|
|
|
|
|
.DocumentRevisions-V100 |
|
|
|
|
|
.fseventsd |
|
|
|
|
|
.Spotlight-V100 |
|
|
|
|
|
.TemporaryItems |
|
|
|
|
|
.Trashes |
|
|
|
|
|
.VolumeIcon.icns |
|
|
|
|
|
.com.apple.timemachine.donotpresent |
|
|
|
|
|
|
|
|
|
|
|
# Directories potentially created on remote AFP share |
|
|
|
|
|
.AppleDB |
|
|
|
|
|
.AppleDesktop |
|
|
|
|
|
Network Trash Folder |
|
|
|
|
|
Temporary Items |
|
|
|
|
|
.apdisk |
|
|
|
|
|
|
|
|
|
|
|
*.metadata |
|
|
|
|
|
bin/ |
|
|
|
|
|
tmp/ |
|
|
|
|
|
*.tmp |
|
|
|
|
|
*.bak |
|
|
|
|
|
*.swp |
|
|
|
|
|
*~.nib |
|
|
|
|
|
local.properties |
|
|
|
|
|
.settings/ |
|
|
|
|
|
.loadpath |
|
|
|
|
|
.recommenders |
|
|
|
|
|
|
|
|
|
|
|
# External tool builders |
|
|
|
|
|
.externalToolBuilders/ |
|
|
|
|
|
|
|
|
|
|
|
# Locally stored "Eclipse launch configurations" |
|
|
|
|
|
*.launch |
|
|
|
|
|
|
|
|
|
|
|
# PyDev specific (Python IDE for Eclipse) |
|
|
|
|
|
*.pydevproject |
|
|
|
|
|
|
|
|
|
|
|
# CDT-specific (C/C++ Development Tooling) |
|
|
|
|
|
.cproject |
|
|
|
|
|
|
|
|
|
|
|
# CDT- autotools |
|
|
|
|
|
.autotools |
|
|
|
|
|
|
|
|
|
|
|
# Java annotation processor (APT) |
|
|
|
|
|
.factorypath |
|
|
|
|
|
|
|
|
|
|
|
# PDT-specific (PHP Development Tools) |
|
|
|
|
|
.buildpath |
|
|
|
|
|
|
|
|
|
|
|
# sbteclipse plugin |
|
|
|
|
|
.target |
|
|
|
|
|
|
|
|
|
|
|
# Tern plugin |
|
|
|
|
|
.tern-project |
|
|
|
|
|
|
|
|
|
|
|
# TeXlipse plugin |
|
|
|
|
|
.texlipse |
|
|
|
|
|
|
|
|
|
|
|
# STS (Spring Tool Suite) |
|
|
|
|
|
.springBeans |
|
|
|
|
|
|
|
|
|
|
|
# Code Recommenders |
|
|
|
|
|
.recommenders/ |
|
|
|
|
|
|
|
|
|
|
|
# Annotation Processing |
|
|
|
|
|
.apt_generated/ |
|
|
|
|
|
.apt_generated_test/ |
|
|
|
|
|
|
|
|
|
|
|
# Scala IDE specific (Scala & Java development for Eclipse) |
|
|
|
|
|
.cache-main |
|
|
|
|
|
.scala_dependencies |
|
|
|
|
|
.worksheet |
|
|
|
|
|
|
|
|
|
|
|
# Uncomment this line if you wish to ignore the project description file. |
|
|
|
|
|
# Typically, this file would be tracked if it contains build/dependency configurations: |
|
|
|
|
|
#.project |
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> 28280ec94efca9a2a06808ca8279c3bace4835de |
|
|
*.metadata/ |
|
|
*.metadata/ |
|
|
*.class |
|
|
*.class |
|
|
/GameProject/doc/ |
|
|
/GameProject/doc/ |
|
@ -6,3 +98,5 @@ |
|
|
/GameProject/log\\log4j.log |
|
|
/GameProject/log\\log4j.log |
|
|
/GameProject/highscore.txt |
|
|
/GameProject/highscore.txt |
|
|
/GameProject/bin/ |
|
|
/GameProject/bin/ |
|
|
|
|
|
|
|
|
|
|
|
GameProject/log\log4j.log |