diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-22 13:15:36 +0100 |
| commit | 01d9681a4d75be566f359f54fc37173b043befdf (patch) | |
| tree | da097e38d1c4f7b71b929ba6477156d5b5da3171 /src/server/game/Scripting/ScriptLoader.cpp | |
| parent | 4f6db255a23b8d321bea2265295fd09ba3095833 (diff) | |
| parent | 44c0d66d63f58a022045efbb6cff6e1278f6a8cb (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/authserver/Realms/RealmList.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
Diffstat (limited to 'src/server/game/Scripting/ScriptLoader.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptLoader.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 6c77daa19d2..c9b65c3a046 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -269,7 +269,6 @@ void AddSC_eastern_plaguelands(); void AddSC_eversong_woods(); void AddSC_ghostlands(); void AddSC_hinterlands(); -void AddSC_ironforge(); void AddSC_isle_of_queldanas(); void AddSC_loch_modan(); void AddSC_redridge_mountains(); @@ -280,7 +279,6 @@ void AddSC_swamp_of_sorrows(); void AddSC_tirisfal_glades(); void AddSC_undercity(); void AddSC_western_plaguelands(); -void AddSC_westfall(); void AddSC_wetlands(); //kalimdor @@ -992,7 +990,6 @@ void AddEasternKingdomsScripts() AddSC_eversong_woods(); AddSC_ghostlands(); AddSC_hinterlands(); - AddSC_ironforge(); AddSC_isle_of_queldanas(); AddSC_loch_modan(); AddSC_redridge_mountains(); @@ -1003,7 +1000,6 @@ void AddEasternKingdomsScripts() AddSC_tirisfal_glades(); AddSC_undercity(); AddSC_western_plaguelands(); - AddSC_westfall(); AddSC_wetlands(); #endif } |