aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptLoader.cpp
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-01-05 16:55:17 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-01-05 16:55:17 +0100
commit24e0eb1812f94c5092009f78ced3306f142d2789 (patch)
tree0118c5abc4e0bb3e8e2a218ca2c9c1934f8eb0d1 /src/server/game/Scripting/ScriptLoader.cpp
parent8db66bfefdb9ec7a722dd93aadbbd818c567fba0 (diff)
parent7dd0cd4403d7f28343a751e7b85aeb30d3968ff5 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts: src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/game/Scripting/ScriptLoader.cpp')
-rw-r--r--src/server/game/Scripting/ScriptLoader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 9276ca65b45..cfdc1f81b91 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -193,6 +193,7 @@ void AddSC_boss_lorekeeperpolkelt();
void AddSC_boss_rasfrost();
void AddSC_boss_theravenian();
void AddSC_boss_vectus();
+void AddSC_boss_kirtonos_the_herald();
void AddSC_instance_scholomance();
void AddSC_shadowfang_keep(); //Shadowfang keep
void AddSC_instance_shadowfang_keep();
@@ -828,6 +829,7 @@ void AddEasternKingdomsScripts()
AddSC_boss_rasfrost();
AddSC_boss_theravenian();
AddSC_boss_vectus();
+ AddSC_boss_kirtonos_the_herald();
AddSC_instance_scholomance();
AddSC_shadowfang_keep(); //Shadowfang keep
AddSC_instance_shadowfang_keep();