diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
| commit | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch) | |
| tree | 5aad5623d352ec0b4aa245856958c61a384861c7 /manaplus.cbp | |
| parent | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff) | |
| parent | 71fe51d38a406012e166589b7b720d83c1ab3ade (diff) | |
| download | mv-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.gz mv-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.bz2 mv-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.xz mv-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.zip | |
Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27
Conflicts:
data/Makefile.am
Diffstat (limited to 'manaplus.cbp')
| -rw-r--r-- | manaplus.cbp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/manaplus.cbp b/manaplus.cbp index 3c39ed68b..26f3b7c5e 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -589,6 +589,8 @@ <Unit filename="src\resources\animation.h" />
<Unit filename="src\resources\beinginfo.cpp" />
<Unit filename="src\resources\beinginfo.h" />
+ <Unit filename="src\resources\chardb.cpp" />
+ <Unit filename="src\resources\chardb.h" />
<Unit filename="src\resources\colordb.cpp" />
<Unit filename="src\resources\colordb.h" />
<Unit filename="src\resources\dye.cpp" />
|