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

Conflicts:
	src/server/scripts/CMakeLists.txt
This commit is contained in:
Vincent-Michael committed 2013-08-09 20:02:21 +02:00
commit 99aa4649d2
33 files changed
+998 -467

No files matched your search

+1
View File
@@ -29,6 +29,7 @@ void AddOutlandScripts();
void AddNorthrendScripts();
void AddMaelstromScripts();
void AddEventScripts();
void AddPetScripts();
void AddBattlegroundScripts();
void AddOutdoorPvPScripts();
void AddCustomScripts();