diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /src/Makefile.am | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | plus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.gz plus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.bz2 plus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.xz plus-62ec17f6e489ec50f17219444468aeb8969dc961.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.cpp
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7263592ff..a0c96a8ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,6 +45,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/emoteshortcutcontainer.h \ gui/widgets/flowcontainer.cpp \ gui/widgets/flowcontainer.h \ + gui/widgets/guildchattab.cpp \ + gui/widgets/guildchattab.h \ gui/widgets/horizontcontainer.cpp \ gui/widgets/horizontcontainer.h \ gui/widgets/icon.cpp \ @@ -378,6 +380,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ animatedsprite.h \ animationparticle.cpp \ animationparticle.h \ + auctionmanager.cpp \ + auctionmanager.h \ avatar.cpp \ avatar.h \ being.cpp \ @@ -420,6 +424,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ guichanfwd.h \ guild.cpp \ guild.h \ + guildmanager.cpp \ + guildmanager.h \ imageparticle.cpp \ imageparticle.h \ imagesprite.cpp \ |