Space von Team 22 (Nico B. Benjamin F. Lea A.)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

102 lines
1.6 KiB

3 years ago
3 years ago
3 years ago
3 years ago
  1. <<<<<<< HEAD
  2. *.DS_Store
  3. =======
  4. # General
  5. .DS_Store
  6. .AppleDouble
  7. .LSOverride
  8. # Icon must end with two \r
  9. Icon
  10. # Thumbnails
  11. ._*
  12. # Files that might appear in the root of a volume
  13. .DocumentRevisions-V100
  14. .fseventsd
  15. .Spotlight-V100
  16. .TemporaryItems
  17. .Trashes
  18. .VolumeIcon.icns
  19. .com.apple.timemachine.donotpresent
  20. # Directories potentially created on remote AFP share
  21. .AppleDB
  22. .AppleDesktop
  23. Network Trash Folder
  24. Temporary Items
  25. .apdisk
  26. *.metadata
  27. bin/
  28. tmp/
  29. *.tmp
  30. *.bak
  31. *.swp
  32. *~.nib
  33. local.properties
  34. .settings/
  35. .loadpath
  36. .recommenders
  37. # External tool builders
  38. .externalToolBuilders/
  39. # Locally stored "Eclipse launch configurations"
  40. *.launch
  41. # PyDev specific (Python IDE for Eclipse)
  42. *.pydevproject
  43. # CDT-specific (C/C++ Development Tooling)
  44. .cproject
  45. # CDT- autotools
  46. .autotools
  47. # Java annotation processor (APT)
  48. .factorypath
  49. # PDT-specific (PHP Development Tools)
  50. .buildpath
  51. # sbteclipse plugin
  52. .target
  53. # Tern plugin
  54. .tern-project
  55. # TeXlipse plugin
  56. .texlipse
  57. # STS (Spring Tool Suite)
  58. .springBeans
  59. # Code Recommenders
  60. .recommenders/
  61. # Annotation Processing
  62. .apt_generated/
  63. .apt_generated_test/
  64. # Scala IDE specific (Scala & Java development for Eclipse)
  65. .cache-main
  66. .scala_dependencies
  67. .worksheet
  68. # Uncomment this line if you wish to ignore the project description file.
  69. # Typically, this file would be tracked if it contains build/dependency configurations:
  70. #.project
  71. >>>>>>> 28280ec94efca9a2a06808ca8279c3bace4835de
  72. *.metadata/
  73. *.class
  74. /GameProject/doc/
  75. /GameProject/log/
  76. /GameProject/log\\log4j.log
  77. /GameProject/highscore.txt
  78. /GameProject/bin/
  79. GameProject/log\log4j.log