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

Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Spells/spell_rogue.cpp

2014-01-24 19:36:32 +01:00

..

AlteracValley

Update copyright note for 2014.

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

BaradinHold

Misc: missing changes after merge

2014-01-14 12:38:19 +01:00

BlackrockMountain

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

2014-01-24 19:36:32 +01:00

Deadmines

Merge branch 'master' into 4.3.4

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

Gnomeregan

Scripts: Gossip can crash with null instance

2014-01-24 17:08:17 +01:00

Karazhan

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

2014-01-24 19:36:32 +01:00

MagistersTerrace

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

ScarletEnclave

Merge branch 'master' into 4.3.4

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

ScarletMonastery

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

Scholomance

Update copyright note for 2014.

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

ShadowfangKeep

Scripts: Gossip can crash with null instance

2014-01-24 17:08:17 +01:00

Stratholme

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

SunkenTemple

Update copyright note for 2014.

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

SunwellPlateau

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

TheStockade

Update copyright note for 2014.

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

Uldaman

Update copyright note for 2014.

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

ZulAman

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

ZulGurub

Scripts: A lots of changes here and there (maybe useless?!?)

2014-01-23 22:54:01 +01:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

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

zone_alterac_mountains.cpp

Update copyright note for 2014.

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

zone_arathi_highlands.cpp

Merge branch 'master' into 4.3.4

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

zone_blasted_lands.cpp

Update copyright note for 2014.

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

zone_burning_steppes.cpp

Fix non pch build

2014-01-12 02:02:02 +01:00

zone_duskwood.cpp

Update copyright note for 2014.

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

zone_eastern_plaguelands.cpp

Update copyright note for 2014.

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

zone_eversong_woods.cpp

Update copyright note for 2014.

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

zone_ghostlands.cpp

Merge branch 'master' into 4.3.4

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

zone_hinterlands.cpp

Merge branch 'master' into 4.3.4

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

zone_ironforge.cpp

Merge branch 'master' into 4.3.4

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

zone_isle_of_queldanas.cpp

Merge branch 'master' into 4.3.4

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

zone_loch_modan.cpp

Merge branch 'master' into 4.3.4

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

zone_redridge_mountains.cpp

Merge branch 'master' into 4.3.4

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

zone_silverpine_forest.cpp

Merge branch 'master' into 4.3.4

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

zone_stormwind_city.cpp

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

2014-01-24 19:36:32 +01:00

zone_stranglethorn_vale.cpp

Update copyright note for 2014.

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

zone_swamp_of_sorrows.cpp

Merge branch 'master' into 4.3.4

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

zone_tirisfal_glades.cpp

Merge branch 'master' into 4.3.4

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

zone_undercity.cpp

Update copyright note for 2014.

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

zone_western_plaguelands.cpp

Update copyright note for 2014.

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

zone_westfall.cpp

Update copyright note for 2014.

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

zone_wetlands.cpp

Update copyright note for 2014.

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