diff options
author | Zaba999 <qrwfw5rp> | 2012-10-11 23:10:07 +0200 |
---|---|---|
committer | Zaba999 <qrwfw5rp> | 2012-10-11 23:10:07 +0200 |
commit | 7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9 (patch) | |
tree | 10915bce6a98c2b0848421dbb79b36ce52bb045b /.gitignore | |
parent | 8a932fed3e5700af283017deab3cb1da11cb0dce (diff) | |
parent | dfe21c5a9c2ebf3df0f445014588bcce0387d699 (diff) | |
download | colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.tar.gz colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.tar.bz2 colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.zip |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -1,9 +1,19 @@ # Ignore the documentation folder /doc -# Ignore the CMake build files -/CMakeFiles -/CMakeCache.txt -/cmake_install.cmake -/Makefile +# We don't want anyone to checkin /data folder +/data + +# Ignore local data +/colobot.ini +/savegame +# Ignore the CMake build files +CMakeFiles +CMakeCache.txt +cmake_install.cmake +Makefile +/install_manifest.txt +/Testing +/CTestTestfile.cmake +/src/CBot/tests/CBot_console/bin/ |