Carbenium 7d5d040948 Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4 ...

Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp

2015-07-21 21:45:04 +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 'c87de730fae0914a5d0741365066007a46f9a469' into 4.3.4

2015-07-21 21:32:49 +02:00

Gundrak

Update (C) date

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

IcecrownCitadel

Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

2015-07-21 21:45:04 +02:00

Naxxramas

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

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

Nexus

Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4

2015-07-21 21:21:09 +02:00

Ulduar

Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4

2015-07-21 20:45:16 +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

Update (C) date

2015-07-19 13:37:44 +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