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

Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h

2014-08-28 21:00:53 +02:00

..

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

spell_dk.cpp

Core/Spells: Fix Bloodworms summon count

2014-08-02 05:17:42 +02:00

spell_druid.cpp

Merge branch master into boost

2014-07-13 16:52:38 -05:00

spell_generic.cpp

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

2014-08-24 02:11:33 +02:00

spell_holiday.cpp

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

spell_hunter.cpp

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

2014-07-19 03:51:11 +02:00

spell_item.cpp

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

2014-08-24 02:11:33 +02:00

spell_mage.cpp

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

2014-07-19 17:03:32 +02:00

spell_paladin.cpp

Merge branch 'Xanvia/ShoR' into 4.3.4

2014-08-24 13:38:54 +02:00

spell_pet.cpp

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

spell_priest.cpp

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

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

spell_quest.cpp

Scripts/Quest: Fix some movement stuff for Quest "Death Comes From On High"

2014-08-28 20:17:43 +02:00

spell_rogue.cpp

Merge branch 'PortgasDAce/1' into 4.3.4

2014-08-24 14:04:54 +02:00

spell_shaman.cpp

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

2014-08-28 21:00:53 +02:00

spell_warlock.cpp

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

2014-06-27 19:39:23 +02:00

spell_warrior.cpp

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

2014-08-24 02:11:33 +02:00