diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
| commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
| tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /manaplus.cbp | |
| parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
| parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
| download | plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip | |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'manaplus.cbp')
| -rw-r--r-- | manaplus.cbp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/manaplus.cbp b/manaplus.cbp index 26f3b7c5e..e44f3718d 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -668,6 +668,10 @@ <Unit filename="src\utils\mkdir.cpp" />
<Unit filename="src\utils\mkdir.h" />
<Unit filename="src\utils\mutex.h" />
+ <Unit filename="src\utils\paths.cpp" />
+ <Unit filename="src\utils\paths.h" />
+ <Unit filename="src\utils\process.cpp" />
+ <Unit filename="src\utils\process.h" />
<Unit filename="src\utils\sha256.cpp" />
<Unit filename="src\utils\sha256.h" />
<Unit filename="src\utils\specialfolder.cpp" />
@@ -676,6 +680,10 @@ <Unit filename="src\utils\stringutils.h" />
<Unit filename="src\utils\xml.cpp" />
<Unit filename="src\utils\xml.h" />
+ <Unit filename="src\test\testlauncher.cpp" />
+ <Unit filename="src\test\testlauncher.h" />
+ <Unit filename="src\test\testmain.cpp" />
+ <Unit filename="src\test\testmain.h" />
<Unit filename="src\variabledata.h" />
<Unit filename="src\vector.cpp" />
<Unit filename="src\vector.h" />
|