*Merge.

--HG-- branch : trunk
2009-01-09 16:43:23 -06:00
parent 5c8f52d134 90a82a81ad
commit 1ffb1cef33
66 changed files with 1270 additions and 621 deletions
@@ -600,6 +600,8 @@ class Spell
        // we can't store original aura link to prevent access to deleted auras
        // and in same time need aura data and after aura deleting.
        SpellEntry const* m_triggeredByAuraSpell;
+
+        uint32 m_customAttr;
 };

 namespace Trinity