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 /src/Makefile.am | |
| parent | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff) | |
| parent | 71fe51d38a406012e166589b7b720d83c1ab3ade (diff) | |
| download | manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.gz manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.bz2 manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.tar.xz manaverse-b6eb53b9abdf48b88cb1978b9af97f2a879d2717.zip | |
Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27
Conflicts:
data/Makefile.am
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4b1d224bc..6ab63bc70 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -309,6 +309,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/animation.h \ resources/beinginfo.cpp \ resources/beinginfo.h \ + resources/chardb.cpp \ + resources/chardb.h \ resources/colordb.cpp \ resources/colordb.h \ resources/dye.cpp \ |