diff options
| author | erihel <erihel@gmail.com> | 2012-09-03 18:26:51 +0200 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-09-03 18:26:51 +0200 |
| commit | 5903e400d476c2cf62c146643a0693c4fc29d68a (patch) | |
| tree | 3bebfe2b36b7eeb0f97232fbc9dd20d5e6c0f94c /src/CMakeLists.txt | |
| parent | 6ba0f42f22a170625f15879e01b4653a4ac153a1 (diff) | |
| parent | 7f277c9ab9912bcf2a7e5e4b07faa506cb7527c2 (diff) | |
| download | colobot-5903e400d476c2cf62c146643a0693c4fc29d68a.tar.gz colobot-5903e400d476c2cf62c146643a0693c4fc29d68a.tar.bz2 colobot-5903e400d476c2cf62c146643a0693c4fc29d68a.zip | |
Merge branch 'dev' of https://github.com/adiblol/colobot into dev-ui
Conflicts:
src/common/restext.cpp
src/common/restext.h
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 c3b460c..efbd681 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,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 |