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

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp

2013-02-03 23:11:48 +01:00

..

Auras

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

2013-02-03 23:11:48 +01:00

Spell.cpp

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

2013-01-28 01:04:37 +00:00

Spell.h

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

2013-01-28 01:04:37 +00:00

SpellEffects.cpp

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

2013-02-02 00:16:11 +01:00

SpellInfo.cpp

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

2013-02-02 00:16:11 +01:00

SpellInfo.h

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

SpellMgr.cpp

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

2013-02-02 00:16:11 +01:00

SpellMgr.h

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

SpellScript.cpp

Core/Scripts: Allow persistent area auras to use DoCheckAreaTarget hook.

2013-02-02 16:45:57 +01:00

SpellScript.h

Core/SpellScripts: implement Spell Proc Hooks and use it in old and new proc system

2013-01-11 01:21:44 +01:00