Spp d35d33aa86 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/CMakeLists.txt

2013-01-03 09:17:53 +01:00

..

BlackfathomDeeps

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

CavernsOfTime

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

HallsOfOrigination

Core/Misc: Update headers to 2013

2013-01-02 13:31:19 +01:00

Maraudon

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

OnyxiasLair

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

RazorfenDowns

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

RazorfenKraul

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

RuinsOfAhnQiraj

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

TempleOfAhnQiraj

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

WailingCaverns

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

ZulFarrak

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

boss_azuregos.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_ashenvale.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_azshara.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_azuremyst_isle.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_bloodmyst_isle.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_darkshore.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_desolace.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_durotar.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_dustwallow_marsh.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_felwood.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_feralas.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_moonglade.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_mulgore.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_orgrimmar.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_silithus.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_stonetalon_mountains.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_tanaris.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_teldrassil.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30

zone_the_barrens.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_thousand_needles.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_thunder_bluff.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_ungoro_crater.cpp

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

zone_winterspring.cpp

Core/Scripting: Rename zone scripts.

2013-01-02 14:52:13 -03:30