Merge commit 'origin/master' into 310
commitf47d7a576fdbc2aa1a895868c3bc56b168595fa0
authortomrus88 <tomrus88@gmail.com>
Sat, 9 May 2009 12:03:32 +0000 (9 16:03 +0400)
committertomrus88 <tomrus88@gmail.com>
Sat, 9 May 2009 12:03:32 +0000 (9 16:03 +0400)
tree5eb832285277affb9b34e59d5d143033ccab9f7f
parenta88c59f3fec84f198ee636ced3d4f52c2d317baf
parent3468c92a2d858dbb0dc2feef48231b9e902501ba
Merge commit 'origin/master' into 310
src/game/AchievementMgr.cpp
src/game/Level1.cpp
src/game/Player.cpp
src/game/Spell.cpp
src/game/SpellAuras.cpp
src/game/SpellEffects.cpp
src/game/Unit.cpp
src/game/Unit.h