Merge branch 'master' into 303
commit017dc0ef168289db9fdecd4d226532da75f08f24
authortomrus88 <tomrus88@gmail.com>
Tue, 28 Oct 2008 20:04:02 +0000 (28 23:04 +0300)
committertomrus88 <tomrus88@gmail.com>
Tue, 28 Oct 2008 20:04:02 +0000 (28 23:04 +0300)
tree7ad15ff21dcbd0079e3bea403c76d5ab39600bf7
parent9633076d7a2bc5a6246d7f724524f4b0f2dfabdc
parent3f094b46a1ea7120cdecdddc055357e27fe27f38
Merge branch 'master' into 303
13 files changed:
src/game/Creature.cpp
src/game/Creature.h
src/game/Group.h
src/game/GroupHandler.cpp
src/game/Level2.cpp
src/game/Level3.cpp
src/game/NPCHandler.cpp
src/game/ObjectMgr.cpp
src/game/ObjectMgr.h
src/game/Player.cpp
src/game/SpellEffects.cpp
src/game/World.cpp
src/game/WorldSession.cpp