Public Git Hosting - getmangos.git/commit

Merge branch 'master' into 303

Conflicts:
src/game/CharacterHandler.cpp
src/game/Chat.h
src/game/Player.h
src/game/World.h
src/game/debugcmds.cpp

29 files changed:

sql/characters.sql	diff1 \|	diff2 \|	blob \| history
sql/mangos.sql	diff1 \|	diff2 \|	blob \| history
src/game/BattleGround.cpp	diff1 \|	diff2 \|	blob \| history
src/game/BattleGround.h	diff1 \|	diff2 \|	blob \| history
src/game/BattleGroundMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/BattleGroundMgr.h	diff1 \|	diff2 \|	blob \| history
src/game/CharacterHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Chat.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Chat.h	diff1 \|	diff2 \|	blob \| history
src/game/Group.h	diff1 \|	diff2 \|	blob \| history
src/game/Language.h	diff1 \|	diff2 \|	blob \| history
src/game/Level3.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MapManager.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MovementHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.h	diff1 \|	diff2 \|	blob \| history
src/game/PetitionsHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.h	diff1 \|	diff2 \|	blob \| history
src/game/SpellAuras.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellEffects.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.h	diff1 \|	diff2 \|	blob \| history
src/game/World.cpp	diff1 \|	diff2 \|	blob \| history
src/game/World.h	diff1 \|	diff2 \|	blob \| history
src/game/WorldSession.h	diff1 \|	diff2 \|	blob \| history
src/game/debugcmds.cpp	diff1 \|	diff2 \|	blob \| history
src/mangosd/mangosd.conf.dist.in	diff1 \|	diff2 \|	blob \| history
src/shared/Database/DBCStructure.h	diff1 \|	diff2 \|	blob \| history

MaNGOS is a free, Open Source implementation of a game server compatible with the original World of Warcraft client.

sql/characters.sql	diff1 \|	diff2 \|	blob \| history
sql/mangos.sql	diff1 \|	diff2 \|	blob \| history
src/game/BattleGround.cpp	diff1 \|	diff2 \|	blob \| history
src/game/BattleGround.h	diff1 \|	diff2 \|	blob \| history
src/game/BattleGroundMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/BattleGroundMgr.h	diff1 \|	diff2 \|	blob \| history
src/game/CharacterHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Chat.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Chat.h	diff1 \|	diff2 \|	blob \| history
src/game/Group.h	diff1 \|	diff2 \|	blob \| history
src/game/Language.h	diff1 \|	diff2 \|	blob \| history
src/game/Level3.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MapManager.cpp	diff1 \|	diff2 \|	blob \| history
src/game/MovementHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/game/ObjectMgr.h	diff1 \|	diff2 \|	blob \| history
src/game/PetitionsHandler.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Player.h	diff1 \|	diff2 \|	blob \| history
src/game/SpellAuras.cpp	diff1 \|	diff2 \|	blob \| history
src/game/SpellEffects.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.cpp	diff1 \|	diff2 \|	blob \| history
src/game/Unit.h	diff1 \|	diff2 \|	blob \| history
src/game/World.cpp	diff1 \|	diff2 \|	blob \| history
src/game/World.h	diff1 \|	diff2 \|	blob \| history
src/game/WorldSession.h	diff1 \|	diff2 \|	blob \| history
src/game/debugcmds.cpp	diff1 \|	diff2 \|	blob \| history
src/mangosd/mangosd.conf.dist.in	diff1 \|	diff2 \|	blob \| history
src/shared/Database/DBCStructure.h	diff1 \|	diff2 \|	blob \| history