diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-07-10 17:41:22 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-07-10 17:41:22 +0200 |
| commit | 9ac578d5f2cee68545ff99b314b645804424ccc1 (patch) | |
| tree | 3b45060ff4c647893778309742b1aaa29f3bfe1d /data | |
| parent | 9a6c06665cc35f22b2e0400897b91fd65d0bdee5 (diff) | |
| parent | d9b3c4b6a34cd6829430e2204108e740184386d9 (diff) | |
| download | colobot-9ac578d5f2cee68545ff99b314b645804424ccc1.tar.gz colobot-9ac578d5f2cee68545ff99b314b645804424ccc1.tar.bz2 colobot-9ac578d5f2cee68545ff99b314b645804424ccc1.zip | |
Merge branch 'dev' of github.com:colobot/colobot into dev
Conflicts:
po/de.po
po/fr.po
po/pl.po
po/ru.po
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions