Vincent-Michael aca68428c2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp

2013-07-23 02:03:35 +02:00

..

Commands

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

2013-07-23 02:03:35 +02:00

Custom

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

EasternKingdoms

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

2013-07-21 23:49:38 +02:00

Events

Scripted: Add some missing override

2013-07-15 15:14:01 +02:00

Examples

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

Kalimdor

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

2013-07-16 14:42:38 +01:00

Northrend

Scripted/IcecrownCitadel: Remove spell script for lk play movie

2013-07-22 16:15:21 +02:00

OutdoorPvP

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

2013-07-14 16:10:20 +01:00

Outland

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

2013-07-15 18:04:04 +02:00

PrecompiledHeaders

…

Spells

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

2013-07-23 02:03:35 +02:00

World

Core/Spells: Fix warlock "Healthstone" for 4.3.4

2013-07-22 15:42:21 +02:00

CMakeLists.txt

CMake: Include AreaTrigger directory in CMake files

2013-05-26 05:07:49 +03:00