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

Conflicts:
	sql/base/dev/world_database.sql
	src/server/game/Entities/Player/Player.h
This commit is contained in:
Vincent-Michael committed 2014-09-22 06:41:14 +02:00
commit 15520e38d0
72 files changed
+1453 -1775

No files matched your search

-1
View File
@@ -19,7 +19,6 @@
#define SC_SCRIPTLOADER_H
void AddScripts();
void AddExampleScripts();
void AddSpellScripts();
void AddCommandScripts();
void AddWorldScripts();