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 /manaplus.cbp | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.gz manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.bz2 manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.xz manaplus-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 'manaplus.cbp')
| -rw-r--r-- | manaplus.cbp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/manaplus.cbp b/manaplus.cbp index 8ed18dbed..1f7308935 100644 --- a/manaplus.cbp +++ b/manaplus.cbp @@ -109,6 +109,8 @@ <Unit filename="src\animatedsprite.h" />
<Unit filename="src\animationparticle.cpp" />
<Unit filename="src\animationparticle.h" />
+ <Unit filename="src\auctionmanager.cpp" />
+ <Unit filename="src\auctionmanager.h" />
<Unit filename="src\avatar.cpp" />
<Unit filename="src\avatar.h" />
<Unit filename="src\being.cpp" />
@@ -310,6 +312,8 @@ <Unit filename="src\gui\widgets\emoteshortcutcontainer.h" />
<Unit filename="src\gui\widgets\flowcontainer.cpp" />
<Unit filename="src\gui\widgets\flowcontainer.h" />
+ <Unit filename="src\gui\widgets\guildchattab.cpp" />
+ <Unit filename="src\gui\widgets\guildchattab.h" />
<Unit filename="src\gui\widgets\horizontcontainer.cpp" />
<Unit filename="src\gui\widgets\horizontcontainer.h" />
<Unit filename="src\gui\widgets\icon.cpp" />
@@ -394,6 +398,8 @@ <Unit filename="src\guichanfwd.h" />
<Unit filename="src\guild.cpp" />
<Unit filename="src\guild.h" />
+ <Unit filename="src\guildmanager.cpp" />
+ <Unit filename="src\guildmanager.h" />
<Unit filename="src\imageparticle.cpp" />
<Unit filename="src\imageparticle.h" />
<Unit filename="src\imagesprite.cpp" />
|