Spp a0c8193ee7 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp

2012-11-16 08:51:15 +01:00

..

base

Fix merge conflic and typos in worldserver config file and characters.sql

2012-11-09 09:03:29 +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

Merge branch 'master' into 4.3.4

2012-11-16 08:51:15 +01:00