diff options
| author | krzys-h <krzys_h@interia.pl> | 2014-10-22 17:52:17 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2014-10-22 17:52:17 +0200 |
| commit | 2d043d46bb85f486847300080e4d58add49c0a44 (patch) | |
| tree | b79da960c4d3b7d0452b0a199be19da61133df30 /po | |
| parent | d3a722a0c56119f13d5ff3e68e9f4560c7924788 (diff) | |
| parent | d019a4990f2e2da71555daf085a3e09c92085fa5 (diff) | |
| download | colobot-2d043d46bb85f486847300080e4d58add49c0a44.tar.gz colobot-2d043d46bb85f486847300080e4d58add49c0a44.tar.bz2 colobot-2d043d46bb85f486847300080e4d58add49c0a44.zip | |
Merge branch 'vieux-blood_mode' into dev
Conflicts:
src/common/restext.cpp
src/ui/maindialog.cpp
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions