Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge commit '2478bbcdb8f44c575714ae2f45aeef4a37556fc2' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2015_02_12_00_world.sql
	sql/updates/world/2015_02_12_01_world.sql
	sql/updates/world/2015_02_12_02_world.sql
	sql/updates/world/2015_02_12_03_world.sql
	sql/updates/world/2015_02_12_04_world.sql
	sql/updates/world/2015_02_12_05_world.sql
	sql/updates/world/2015_02_12_06_world.sql
	sql/updates/world/2015_02_12_07_world.sql
	sql/updates/world/2015_02_12_08_world.sql
	sql/updates/world/2015_02_12_09_world.sql
	sql/updates/world/2015_02_12_10_world.sql
	sql/updates/world/2015_02_13_00_world.sql
	sql/updates/world/2015_02_13_02_world.sql
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
This commit is contained in:
Carbenium committed 2015-07-21 22:07:47 +02:00
2 parents 814ae4ba8b 2478bbcdb8
commit 78da5d8e7e
11 files changed
+210 -200
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Scripting/ScriptLoader.cpp
-2
View File
@@ -368,7 +368,6 @@ void AddSC_dustwallow_marsh();
void AddSC_felwood();
void AddSC_feralas();
void AddSC_moonglade();
void AddSC_mulgore();
void AddSC_orgrimmar();
void AddSC_silithus();
void AddSC_stonetalon_mountains();
@@ -1089,7 +1088,6 @@ void AddKalimdorScripts()
AddSC_felwood();
AddSC_feralas();
AddSC_moonglade();
AddSC_mulgore();
AddSC_orgrimmar();
AddSC_silithus();
AddSC_stonetalon_mountains();