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

Conflicts:
	src/server/scripts/EasternKingdoms/zone_ironforge.cpp
	src/server/scripts/Spells/spell_generic.cpp

2013-07-17 20:24:29 +02:00

..

CMakeLists.txt

Update copyright note for 2013.

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

spell_dk.cpp

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

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

spell_druid.cpp

Scripted: Add some missing override

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

spell_generic.cpp

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

2013-07-17 20:24:29 +02:00

spell_holiday.cpp

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

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

spell_hunter.cpp

Scripted: Add some missing override

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

spell_item.cpp

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

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

spell_mage.cpp

Scripted: Add some missing override

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

spell_paladin.cpp

Scripted: Add some missing override

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

spell_pet.cpp

Core: Fix build

2013-07-15 17:44:32 +02:00

spell_priest.cpp

Scripted: Add some missing override

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

spell_quest.cpp

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

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

spell_rogue.cpp

Scripted: Add some missing override

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

spell_shaman.cpp

Scripted: Add some missing override

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

spell_warlock.cpp

Scripted: Add some missing override

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

spell_warrior.cpp

Core/Spells: Update warrior/utgarde keep "Second Wind" for 4.3.4

2013-07-17 00:42:46 +02:00