From dfdc19f3bc57757965d1d3b760a27622e411eb05 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 13 Jul 2014 16:52:38 -0500 Subject: Merge branch `master` into `boost` Conflicts: BattlegroundMgr.h --- src/server/game/Scripting/ScriptLoader.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/server/game/Scripting/ScriptLoader.cpp') diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index f1359b70aa6..ce01273ab3b 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -263,7 +263,6 @@ void AddSC_instance_zulgurub(); //void AddSC_alterac_mountains(); void AddSC_arathi_highlands(); void AddSC_blasted_lands(); -void AddSC_boss_kruul(); void AddSC_burning_steppes(); void AddSC_duskwood(); void AddSC_eastern_plaguelands(); @@ -978,7 +977,6 @@ void AddEasternKingdomsScripts() //AddSC_alterac_mountains(); AddSC_arathi_highlands(); AddSC_blasted_lands(); - AddSC_boss_kruul(); AddSC_burning_steppes(); AddSC_duskwood(); AddSC_eastern_plaguelands(); -- cgit v1.2.3