diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 22:07:14 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 22:07:14 +0200 |
| commit | 2847aad51fb8165d3ad6fab3ddb1f0275a6f0815 (patch) | |
| tree | ea75eb3bf362fb1b6f122cb7ebf3978fecb1675c /src/CMakeLists.txt | |
| parent | c439964d281f55ce66e4efa6e51239ebb112c65e (diff) | |
| parent | 8ad15c0ef7d06d80abfa736295fbec3c5b005183 (diff) | |
| download | colobot-2847aad51fb8165d3ad6fab3ddb1f0275a6f0815.tar.gz colobot-2847aad51fb8165d3ad6fab3ddb1f0275a6f0815.tar.bz2 colobot-2847aad51fb8165d3ad6fab3ddb1f0275a6f0815.zip | |
Merge branch 'dev' of github.com:adiblol/colobot into dev
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1297c73..2f1b954 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -125,7 +125,7 @@ object/motion/motiontoto.cpp object/motion/motionvehicle.cpp object/motion/motionworm.cpp object/object.cpp -# object/robotmain.cpp +object/robotmain.cpp object/task/task.cpp object/task/taskadvance.cpp object/task/taskbuild.cpp @@ -167,7 +167,7 @@ ui/interface.cpp ui/key.cpp ui/label.cpp ui/list.cpp -# ui/maindialog.cpp +ui/maindialog.cpp ui/mainmap.cpp ui/mainshort.cpp ui/map.cpp |