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

Conflicts:
	src/server/scripts/Northrend/zone_zuldrak.cpp

2013-06-21 22:04:11 +02:00

..

CMakeLists.txt

Update copyright note for 2013.

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

spell_dk.cpp

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

2013-06-13 19:35:01 +02:00

spell_druid.cpp

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

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

spell_generic.cpp

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

2013-06-21 22:04:11 +02:00

spell_holiday.cpp

Core: Fix non-PCH compile (missing headers on some of the scripts)

2013-03-07 22:21:21 +01:00

spell_hunter.cpp

Core: More Function Renaming.

2013-06-11 21:25:12 -02:30

spell_item.cpp

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

2013-06-13 19:35:01 +02:00

spell_mage.cpp

Core/Spells: Fix mage talent "Nether Vortex"

2013-06-18 20:19:30 +02:00

spell_paladin.cpp

Core: Whitespace cleanup

2013-02-07 00:02:22 +01:00

spell_pet.cpp

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

2013-06-13 19:35:01 +02:00

spell_priest.cpp

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

2013-06-13 19:35:01 +02:00

spell_quest.cpp

DB/Quests: Fix Reunited, Dark Horizon, closes #6246 closes #8979

2013-06-17 16:44:04 +02:00

spell_rogue.cpp

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

2013-06-13 19:35:01 +02:00

spell_shaman.cpp

Core: Fix build and some fails

2013-06-16 23:16:07 +02:00

spell_warlock.cpp

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

2013-06-13 19:35:01 +02:00

spell_warrior.cpp

Core/Misc: Fix compile errors introduced in previous merge

2013-01-28 02:54:27 +00:00