*Merge.

--HG-- branch : trunk
2009-05-25 11:08:52 -05:00
parent 98049925a6 ee40287ef7
commit 7e1ca8f2ce
3 changed files with 24 additions and 14 deletions
@@ -139,7 +139,8 @@ enum SpellSpecific
    SPELL_PRESENCE          = 21,
    SPELL_CHARM             = 22,
    SPELL_SCROLL            = 23,
-    SPELL_MAGE_ARCANE_BRILLANCE = 24
+    SPELL_MAGE_ARCANE_BRILLANCE = 24,
+    SPELL_WARRIOR_ENRAGE    = 25,
 };

 #define SPELL_LINKED_MAX_SPELLS  200000