summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2013-01-04 00:05:28 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2013-01-04 00:05:28 +0100
commit89a3f586a224328b430ba2483ce5c12b33709c6a (patch)
tree691e1da1e297f7ea9045be5454747ca454680cb2 /.gitignore
parentc9335534d6bc7a59dbabf6976d41fd1e5edc8ab3 (diff)
parent1d42c71645548ae86b438c84898a07b539f262ac (diff)
downloadcolobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.gz
colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.tar.bz2
colobot-89a3f586a224328b430ba2483ce5c12b33709c6a.zip
Merge branch 'dev' into dev-graphics
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 4f78a85..bc2649c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
# Ignore the documentation folder
/doc
-# We don't want anyone to checkin /data folder
-/data
-
# Ignore local data
/colobot.ini
/savegame