Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_warlock.cpp
This commit is contained in:
Vincent-Michael committed 2013-07-26 02:04:32 +02:00
commit c57fa8f781
7 files changed
+251 -17

No files matched your search

@@ -130,7 +130,6 @@ class spell_warl_aftermath : public SpellScriptLoader
};
// 710 - Banish
/// Updated 4.3.4
class spell_warl_banish : public SpellScriptLoader
{
public: