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

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp

2014-08-15 20:13:34 +02:00

..

Auras

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

2014-08-12 00:45:24 +02:00

Spell.cpp

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

2014-08-15 20:13:34 +02:00

Spell.h

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

2014-08-12 00:45:24 +02:00

SpellEffects.cpp

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

2014-08-12 00:45:24 +02:00

SpellInfo.cpp

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

2014-07-20 03:06:03 +02:00

SpellInfo.h

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

SpellMgr.cpp

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

2014-07-19 15:26:06 +02:00

SpellMgr.h

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

2014-07-20 03:06:03 +02:00

SpellScript.cpp

Buildsystem/MSVC: Warning fixes

2014-07-17 15:42:57 +02:00

SpellScript.h

Core/Server: Add missing overrides

2014-08-09 20:17:40 +01:00