diff options
author | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
commit | 0245fdc6c328edf65b4fd9f45be4f440ef92b6eb (patch) | |
tree | d8237bdeacdee273c2eabaefc14f21637c1f489a /desktop/.gitignore | |
parent | d7ef0a1a5f7cee44eb8faaafefb7bb78e69be1f6 (diff) | |
parent | 83abb8ca8e74176d64944e9681d74aa11ef6cdf9 (diff) | |
download | colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.gz colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.bz2 colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.zip |
Merge branch 'dev-physfs' into dev
Conflicts:
src/app/app.cpp
Diffstat (limited to 'desktop/.gitignore')
-rw-r--r-- | desktop/.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/.gitignore b/desktop/.gitignore index e6649e0..b3d4193 100644 --- a/desktop/.gitignore +++ b/desktop/.gitignore @@ -3,5 +3,8 @@ fr/ 16/ 32/ 48/ +128/ +256/ +512/ colobot.6 colobot.desktop |