DDuarte cdb33ab174 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp

2014-07-24 17:10:21 +01:00

..

CMakeLists.txt

Update copyright note for 2014.

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

spell_dk.cpp

Merge branch 'master' into 4.3.4

2014-07-24 17:10:21 +01:00

spell_druid.cpp

Merge branch master into boost

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

spell_generic.cpp

Merge branch 'master' into 4.3.4

2014-07-24 17:10:21 +01: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

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

2014-07-19 15:26:06 +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

Core: Fix compile and a warning in spell_paladin

2014-07-22 14:38:37 +01: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 remote-tracking branch 'origin/master' into 4.3.4

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

spell_quest.cpp

Core/Misc: Replace rand() calls with SFMT

2014-07-22 21:43:19 +02:00

spell_rogue.cpp

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

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

spell_shaman.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_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' into 4.3.4

2014-07-24 17:10:21 +01:00