Merge branch 'master' into 303
commit925d0fb711133a954539814b07334dd3ce6a515a
authortomrus88 <tomrus88@gmail.com>
Mon, 1 Dec 2008 05:21:10 +0000 (1 08:21 +0300)
committertomrus88 <tomrus88@gmail.com>
Mon, 1 Dec 2008 05:21:10 +0000 (1 08:21 +0300)
tree2f57c9405dc14f4027e213cf0fff2842fbdcd3ca
parent6ffc8f927e7261f12c5f26c6f4e82621c358fbc6
parentc950ac20e7ec408d6ee032c0e5daa223b8a22435
Merge branch 'master' into 303
src/game/CharacterHandler.cpp
src/game/Creature.cpp
src/game/Guild.cpp
src/game/Mail.cpp
src/game/ObjectMgr.cpp
src/game/Player.cpp
src/game/Player.h