Nay 91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp

2012-12-27 17:52:11 +00:00

..

base

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

2012-12-23 08:33:13 -05:00

create

Buildsystem: Stop the retarded recursive hunting for CMakeLists.txt when copying SQL-files nad use the proper method for direct copying.

2010-12-24 18:33:11 +01:00

old

Merge branch 'master' into 4.3.4

2012-11-19 10:09:58 +01:00

updates

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-12-27 17:52:11 +00:00