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.files | |
| 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.files')
| -rw-r--r-- | mana.files | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -369,6 +369,8 @@ ./src/net/manaserv/protocol.h ./src/net/manaserv/specialhandler.cpp ./src/net/manaserv/specialhandler.h +./src/net/manaserv/stats.cpp +./src/net/manaserv/stats.h ./src/net/manaserv/tradehandler.cpp ./src/net/manaserv/tradehandler.h ./src/net/messagehandler.h |