Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/game/Entities/Player/Player.h
This commit is contained in:
Vincent-Michael
2014-09-22 06:41:14 +02:00
parent 1bd700284f ec59c3ab03
commit 15520e38d0
72 changed files with 1453 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/Scripting/ScriptLoader.h
View File

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