Nay b21fe684c1 Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/Spells/SpellMgr.cpp

2013-07-30 14:14:22 +01:00

..

Commands

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

2013-07-25 00:41:37 +02:00

Custom

Update copyright note for 2013.

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

EasternKingdoms

DB/Player: Fix clear glyph for some class

2013-07-26 18:09:10 +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-30 14:14:22 +01:00

Northrend

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

2013-07-29 17:11:25 +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

This reverts commit f580cddc09.

2011-06-28 13:05:15 +02:00

Spells

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

2013-07-29 17:11:25 +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