Merge branch 'master' into 303
commit3f7e6356ea0d83b775a4176ce864e80be1f545a8
authortomrus88 <tomrus88@gmail.com>
Thu, 6 Nov 2008 12:50:47 +0000 (6 15:50 +0300)
committertomrus88 <tomrus88@gmail.com>
Thu, 6 Nov 2008 12:50:47 +0000 (6 15:50 +0300)
tree7819bb5f342623c13afdc00b61fd0fdb9bc3d40a
parent55fe3b7c24a172e201ab3a8c357a3b79eacead10
parent0942b868b23cd722b42471af33ea18fe275d713c
Merge branch 'master' into 303

Conflicts:
contrib/extractor/System.cpp
contrib/extractor/ad.exe
src/game/WorldSocket.cpp
38 files changed:
contrib/extractor/System.cpp
src/game/BattleGround.cpp
src/game/BattleGroundMgr.cpp
src/game/Corpse.cpp
src/game/GameObject.cpp
src/game/GroupHandler.cpp
src/game/Guild.cpp
src/game/Guild.h
src/game/Level2.cpp
src/game/Level3.cpp
src/game/Mail.cpp
src/game/Makefile.am
src/game/Map.cpp
src/game/MapManager.cpp
src/game/MovementHandler.cpp
src/game/NPCHandler.cpp
src/game/Object.h
src/game/ObjectMgr.cpp
src/game/ObjectMgr.h
src/game/Pet.cpp
src/game/Player.cpp
src/game/Player.h
src/game/Spell.cpp
src/game/Spell.h
src/game/SpellAuras.cpp
src/game/SpellAuras.h
src/game/SpellEffects.cpp
src/game/SpellMgr.cpp
src/game/Transports.cpp
src/game/Unit.cpp
src/game/Unit.h
src/game/World.cpp
src/game/WorldSession.h
src/game/WorldSocket.cpp
src/game/debugcmds.cpp
win/VC71/game.vcproj
win/VC80/game.vcproj
win/VC90/game.vcproj