Vincent-Michael c0fc0f237f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/shared/DataStores/DBCFileLoader.h

2013-08-07 11:59:51 +02:00

..

base

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

2013-07-19 22:33:35 +02: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' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-07-28 18:41:57 +02:00

updates

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

2013-08-07 11:59:51 +02:00