diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-05-21 21:56:41 +0200 |
| commit | 63b4c9869b6256ed7644113cd23305b07cf9df03 (patch) | |
| tree | aff0d99f5b58cbaf4195ac755ecfb79f97bf7b65 /mana.cbp | |
| parent | 8c4c5a58c256cce7beb21b68c8a7d6b6ff5c4a3a (diff) | |
| parent | 2953a3f92c5097bd99ff21f4536fe167a32d90c5 (diff) | |
| download | Mana-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.cbp | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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" /> |