Merge branch 'master' into 330
commit95039d128e641fa12b47461d2f9885eabdffeaab
authorVladimirMangos <vladimir@getmangos.com>
Wed, 7 Apr 2010 02:58:42 +0000 (7 06:58 +0400)
committerVladimirMangos <vladimir@getmangos.com>
Wed, 7 Apr 2010 02:58:42 +0000 (7 06:58 +0400)
tree3b2514c001b317996bb07ab501faa3ce84b4c108
parentecd58bed97cb3fcf4dde2851ce54e369efd2836a
parent36505f9b0a02944fcc8ed62c7b90c31c4e8f0934
Merge branch 'master' into 330
src/game/CharacterHandler.cpp
src/game/ObjectMgr.cpp
src/game/Player.cpp
src/game/Player.h
src/game/QuestDef.h
src/game/QuestHandler.cpp
src/game/SharedDefines.h
src/game/SpellAuras.cpp
src/game/Unit.cpp
src/game/World.cpp
src/realmd/AuthSocket.cpp