Merge branch 'master' into 330
commit23fef315f8156dd95412995b8536d7df07309e60
authorVladimirMangos <vladimir@getmangos.com>
Fri, 8 Jan 2010 21:53:31 +0000 (9 00:53 +0300)
committerVladimirMangos <vladimir@getmangos.com>
Fri, 8 Jan 2010 21:53:31 +0000 (9 00:53 +0300)
tree150cf192f89abdb34093177ae9449b9a3bf9243b
parentcaad6224bd6e332abe1d2dd206611f91eced05b0
parentf31e329e14d48b4d0118235814b69668dc5a0738
Merge branch 'master' into 330
src/game/BattleGroundMgr.cpp
src/game/Group.cpp
src/game/Player.cpp
src/game/Player.h