diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-09 13:05:41 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-09 13:05:41 +0200 |
| commit | b3d5491af4f953e8d63800897c40d602de9e9305 (patch) | |
| tree | dc155d2c17a72ce431ef2e28a41bf7169d7ee3e5 /src/CMakeLists.txt | |
| parent | c6673b9aee483cfa64b49395c5c96b023bb09549 (diff) | |
| parent | 7f277c9ab9912bcf2a7e5e4b07faa506cb7527c2 (diff) | |
| download | colobot-b3d5491af4f953e8d63800897c40d602de9e9305.tar.gz colobot-b3d5491af4f953e8d63800897c40d602de9e9305.tar.bz2 colobot-b3d5491af4f953e8d63800897c40d602de9e9305.zip | |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0983a16..dc003b9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,7 +70,8 @@ common/iman.cpp # common/misc.cpp # common/modfile.cpp # common/profile.cpp -# common/restext.cpp +common/restext.cpp +common/restext_strings.c common/stringutils.cpp graphics/core/color.cpp graphics/engine/camera.cpp |