diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-09-08 17:55:48 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-09-08 17:55:48 +0200 |
| commit | 39866db50275c4cf1fd4cc1cc6deb2d1573e24d8 (patch) | |
| tree | 4e2c9a25bd517d6f6c6985c2c8778fd6679f3377 /.gitignore | |
| parent | b5e87aa91fc0ebafc0e00d17c19663dff7d1ac0d (diff) | |
| parent | 2891c2ea4ce2e7c844d1e93db71dcfa8ad2ca100 (diff) | |
| download | colobot-39866db50275c4cf1fd4cc1cc6deb2d1573e24d8.tar.gz colobot-39866db50275c4cf1fd4cc1cc6deb2d1573e24d8.tar.bz2 colobot-39866db50275c4cf1fd4cc1cc6deb2d1573e24d8.zip | |
Fixed @Emxx52 's fail :P
Merge branch 'master' into dev
Conflicts:
src/app/app.cpp
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions