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

..

AzjolNerub

Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4

2015-07-22 00:54:34 +02:00

ChamberOfAspects

Core/Misc: 3.3.5a fixes

2015-08-02 03:06:49 +02:00

CrusadersColiseum

Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4

2015-07-22 02:09:32 +02:00

DraktharonKeep

Update (C) date

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

FrozenHalls

Merge branch '3.3.5' into 4.3.4

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

Gundrak

Fix non pch build.

2015-07-24 11:52:28 +01:00

IcecrownCitadel

Core/Misc: 3.3.5a fixes

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

Naxxramas

Merge branch '3.3.5' into 4.3.4

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

Nexus

Core/Misc: Added some missing overrides

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

Ulduar

Merge branch '3.3.5' into 4.3.4

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

UtgardeKeep

Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4

2015-07-22 00:54:34 +02:00

VaultOfArchavon

Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4

2015-07-21 18:22:27 +02:00

VioletHold

Merge branch '3.3.5' into 4.3.4

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

CMakeLists.txt

Update (C) date

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

isle_of_conquest.cpp

Merge branch '3.3.5' into 4.3.4

2015-07-22 02:26:46 +02:00

zone_borean_tundra.cpp

Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4

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

zone_crystalsong_forest.cpp

Update (C) date

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

zone_dalaran.cpp

Update (C) date

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

zone_dragonblight.cpp

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

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

zone_grizzly_hills.cpp

Update (C) date

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

zone_howling_fjord.cpp

Update (C) date

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

zone_icecrown.cpp

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

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

zone_sholazar_basin.cpp

Update (C) date

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

zone_storm_peaks.cpp

Update (C) date

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

zone_wintergrasp.cpp

Core/Misc: multiple changes

2014-09-19 03:16:59 +02:00

zone_zuldrak.cpp

Update (C) date

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