diff options
| author | Didier Raboud <odyx@debian.org> | 2012-12-16 22:26:29 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-12-16 22:26:29 +0100 |
| commit | 4827440e737248aff2c756444108a4be0b0d63e6 (patch) | |
| tree | 68b48c2c64746bf9ee38d18ad9d9c973b8d23ea3 /cmake | |
| parent | a266692615e146246fd547c5b132a1fcc98b6a10 (diff) | |
| parent | 6bd37341dfe2eb382d654f34a2b89db7fa30d8c2 (diff) | |
| download | colobot-4827440e737248aff2c756444108a4be0b0d63e6.tar.gz colobot-4827440e737248aff2c756444108a4be0b0d63e6.tar.bz2 colobot-4827440e737248aff2c756444108a4be0b0d63e6.zip | |
Merge branch 'dev' into dev-use-installed-i18n
Conflicts:
src/common/config.h.cmake
Diffstat (limited to 'cmake')
0 files changed, 0 insertions, 0 deletions