summaryrefslogtreecommitdiff
path: root/mana.cbp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-21 21:56:41 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-05-21 21:56:41 +0200
commit63b4c9869b6256ed7644113cd23305b07cf9df03 (patch)
treeaff0d99f5b58cbaf4195ac755ecfb79f97bf7b65 /mana.cbp
parent8c4c5a58c256cce7beb21b68c8a7d6b6ff5c4a3a (diff)
parent2953a3f92c5097bd99ff21f4536fe167a32d90c5 (diff)
downloadmana-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.gz
mana-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.bz2
mana-63b4c9869b6256ed7644113cd23305b07cf9df03.tar.xz
mana-63b4c9869b6256ed7644113cd23305b07cf9df03.zip
Merge branch '1.0'
Conflicts: src/beingmanager.cpp src/beingmanager.h src/client.cpp src/localplayer.cpp
Diffstat (limited to 'mana.cbp')
-rw-r--r--mana.cbp2
1 files changed, 2 insertions, 0 deletions
diff --git a/mana.cbp b/mana.cbp
index 4d20d20d..3a7f7403 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -477,6 +477,8 @@
<Unit filename="src\net\manaserv\protocol.h" />
<Unit filename="src\net\manaserv\specialhandler.cpp" />
<Unit filename="src\net\manaserv\specialhandler.h" />
+ <Unit filename="src\net\manaserv\stats.cpp" />
+ <Unit filename="src\net\manaserv\stats.h" />
<Unit filename="src\net\manaserv\tradehandler.cpp" />
<Unit filename="src\net\manaserv\tradehandler.h" />
<Unit filename="src\net\messagehandler.h" />