Merge remote-tracking branch 'origin/master' into mmaps

Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
Nay committed 2012-09-07 03:34:23 +01:00
commit 407286fe81
19 files changed
+149 -33

No files matched your search

@@ -0,0 +1,4 @@
SET @Spell := 28715; -- Flamecap Fire
DELETE FROM `spell_bonus_data` WHERE `entry`=@Spell;
INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`ap_dot_bonus`,`comments`) VALUES
(@Spell,0,0,0,0, 'Flamecap Fire');