summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2013-06-25 09:34:25 +0200
committerDidier Raboud <odyx@debian.org>2013-06-25 09:36:43 +0200
commit3c40e53ea651c837086fb1628443ad3f413a21d0 (patch)
tree23bd87c2804b6096a4ce0feb15578ba35669779b /.gitignore
parent627f86efa406057608c921cf8330c628afb41ab6 (diff)
parent7c2e955e1552a9c4e412ea2c936be61fc78ba010 (diff)
downloadcolobot-3c40e53ea651c837086fb1628443ad3f413a21d0.tar.gz
colobot-3c40e53ea651c837086fb1628443ad3f413a21d0.tar.bz2
colobot-3c40e53ea651c837086fb1628443ad3f413a21d0.zip
Merge tag 'colobot-gold-0.1.0-alpha' into debian
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore27
1 files changed, 16 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 0e9774c..122663d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
-# Ignore the documentation folder
-/doc
-
-# Ignore local data
-/colobot.ini
-/savegame
-
# Ignore the CMake build files
CMakeFiles
CMakeCache.txt
@@ -13,9 +6,21 @@ Makefile
/install_manifest.txt
/Testing
/CTestTestfile.cmake
-/src/CBot/tests/CBot_console/bin/
+
+# Ignore the generated documentation
+/doc
+/Doxyfile
+
+# Ignore targets
+/colobot
+
+# Ignore local data
+/colobot.ini
+/savegame
+
+# Standard build directory
+/build
+
+# Ignore KDevelop files
.kdev4
*.kdev4
-*.flv
-*.mp4
-