Nay 94c8c7ec4e Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp

2012-09-30 15:46:00 +01:00

..

base

Rename SQL and update characters_database.sql

2012-09-10 11:56:37 +01: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

(TDB 335.49) Also move 4.x-only SQLs to the old directory

2012-09-15 21:18:23 +01:00

updates/world

SQL: Rename SQL merged in PR

2012-09-30 15:43:05 +01:00