Carbenium 99ab531e76 Merge branch '3.3.5' into 4.3.4 ...

Conflicts:
	sql/updates/world/2015_07_29_00_world.sql
	sql/updates/world/2015_07_29_01_world.sql
	sql/updates/world/2015_08_01_00_world.sql
	src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_pet.cpp

2015-08-12 21:05:39 +02:00

..

BlackfathomDeeps

Update (C) date

2015-07-19 13:37:44 +02:00

CavernsOfTime

Core/Misc: Added some missing overrides

2015-08-11 12:44:35 +02:00

DireMaul

Update (C) date

2015-07-19 13:37:44 +02:00

Firelands

Update (C) date

2015-07-19 13:37:44 +02:00

HallsOfOrigination

Update (C) date

2015-07-19 13:37:44 +02:00

Maraudon

Update (C) date

2015-07-19 13:37:44 +02:00

OnyxiasLair

Update (C) date

2015-07-19 13:37:44 +02:00

RagefireChasm

Update (C) date

2015-07-19 13:37:44 +02:00

RazorfenDowns

Update (C) date

2015-07-19 13:37:44 +02:00

RazorfenKraul

Update (C) date

2015-07-19 13:37:44 +02:00

RuinsOfAhnQiraj

Update (C) date

2015-07-19 13:37:44 +02:00

TempleOfAhnQiraj

Scripts/Misc: Fix possible crash

2015-08-12 12:43:59 +02:00

WailingCaverns

Update (C) date

2015-07-19 13:37:44 +02:00

ZulFarrak

Update (C) date

2015-07-19 13:37:44 +02:00

CMakeLists.txt

Core/Misc: 3.3.5a fixes

2015-08-09 10:50:16 +02:00

zone_ashenvale.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_azshara.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_azuremyst_isle.cpp

Merge branch '3.3.5' into 4.3.4

2015-07-26 16:52:35 +02:00

zone_bloodmyst_isle.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_darkshore.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_desolace.cpp

Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4

2015-07-22 01:33:48 +02:00

zone_durotar.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_dustwallow_marsh.cpp

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

2015-07-21 20:05:44 +02:00

zone_felwood.cpp

Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4

2015-07-21 22:12:57 +02:00

zone_feralas.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_moonglade.cpp

Fix build

2015-07-24 01:49:34 +02:00

zone_mulgore.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_orgrimmar.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_silithus.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_stonetalon_mountains.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_tanaris.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_the_barrens.cpp

Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4

2015-07-21 22:12:57 +02:00

zone_thousand_needles.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_thunder_bluff.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_ungoro_crater.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

zone_winterspring.cpp

Update (C) date

2015-07-19 13:37:44 +02:00