Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
This commit is contained in:
Spp committed 2013-01-16 15:29:41 +01:00
commit 0e8011657d
30 files changed
+406 -158

No files matched your search

@@ -0,0 +1 @@
DELETE FROM `creature_addon` WHERE guid=49286;
@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `spell_id`=24314;
INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
(24314, 'spell_threatening_gaze');