Merge commit 'origin/master' into 310
commit57b9092cd13def4e558d3f410a9b575eabb9140a
authortomrus88 <tomrus88@gmail.com>
Fri, 8 May 2009 11:31:27 +0000 (8 15:31 +0400)
committertomrus88 <tomrus88@gmail.com>
Fri, 8 May 2009 11:31:27 +0000 (8 15:31 +0400)
tree47c534343840009cc6dc11cfe7628d061b48ddbd
parentfa340cd45d5336b1009a6eb85e019146cb1aaa9d
parent423b1d7f2ae79b793edc5505bd6225d8dcb337aa
Merge commit 'origin/master' into 310
15 files changed:
src/game/CharacterHandler.cpp
src/game/Chat.cpp
src/game/DBCStructure.h
src/game/DBCfmt.h
src/game/ObjectMgr.cpp
src/game/ObjectMgr.h
src/game/Pet.cpp
src/game/Player.cpp
src/game/Player.h
src/game/SharedDefines.h
src/game/Spell.cpp
src/game/SpellAuras.cpp
src/game/SpellEffects.cpp
src/game/Unit.cpp
src/game/Unit.h