Vincent_Michael 3f99890b12 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h

2014-01-21 21:58:30 +01:00

..

Auchindoun

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

BlackTemple

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

CoilfangReservoir

Misc: Minor cosmetic changes here and there

2014-01-21 20:20:38 +01:00

GruulsLair

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

HellfireCitadel

Fix build

2014-01-09 23:31:52 +01:00

TempestKeep

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

boss_doomlord_kazzak.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

boss_doomwalker.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_blades_edge_mountains.cpp

Misc: Minor cosmetic changes here and there

2014-01-21 20:20:38 +01:00

zone_hellfire_peninsula.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_nagrand.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_netherstorm.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_shadowmoon_valley.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_shattrath_city.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_terokkar_forest.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_zangarmarsh.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00