Spp 2e55abcde4 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h

2012-10-19 14:24:11 +02:00

..

base

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

2012-10-16 21:55:01 -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

(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-10-19 14:24:11 +02:00