Carbenium 73933e5e39 Merge commit '4999864c4a85f49513fe9ef7e091f308c0343952' into 4.3.4 ...

Conflicts:
	sql/updates/world/2015_02_14_00_world.sql
	sql/updates/world/2015_02_14_01_world.sql
	sql/updates/world/2015_02_14_02_world.sql
	sql/updates/world/2015_02_16_02_world.sql
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp

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

..

black_temple.cpp

Update (C) date

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

black_temple.h

Update (C) date

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

boss_gurtogg_bloodboil.cpp

Update (C) date

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

boss_illidan.cpp

Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4

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

boss_mother_shahraz.cpp

Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4

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

boss_reliquary_of_souls.cpp

Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4

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

boss_shade_of_akama.cpp

Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4

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

boss_supremus.cpp

Update (C) date

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

boss_teron_gorefiend.cpp

Update (C) date

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

boss_warlord_najentus.cpp

Update (C) date

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

illidari_council.cpp

Update (C) date

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

instance_black_temple.cpp

Update (C) date

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