Carbenium 67d616c195 Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4 ...

Conflicts:
	sql/updates/world/2015_03_01_00_world.sql
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp

2015-07-21 23:20:40 +02:00

..

AzjolNerub

Update (C) date

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

ChamberOfAspects

Update (C) date

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

CrusadersColiseum

Update (C) date

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

DraktharonKeep

Update (C) date

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

FrozenHalls

Merge commit '2478bbcdb8f44c575714ae2f45aeef4a37556fc2' into 4.3.4

2015-07-21 22:07:47 +02:00

Gundrak

Update (C) date

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

IcecrownCitadel

Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4

2015-07-21 23:20:40 +02:00

Naxxramas

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

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

Nexus

Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4

2015-07-21 23:20:40 +02:00

Ulduar

Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4

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

UtgardeKeep

Update (C) date

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

VaultOfArchavon

Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4

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

VioletHold

Update (C) date

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

CMakeLists.txt

Update (C) date

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

isle_of_conquest.cpp

Update (C) date

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

zone_borean_tundra.cpp

Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4

2015-07-21 22:12:57 +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