Carbenium 6dfaec3d97 Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4 ...

Conflicts:
	.gitattributes
	CONTRIBUTING.md
	sql/updates/world/2015_05_11_04_world.sql
	sql/updates/world/2015_05_27_00_world.sql
	sql/updates/world/2015_05_27_01_world.sql
	sql/updates/world/2015_06_06_01_world_335.sql
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_rogue.cpp

2015-07-22 02:09:32 +02:00

..

MapScripts.cpp

Update (C) date

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

ScriptLoader.cpp

Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4

2015-07-22 02:09:32 +02:00

ScriptLoader.h

Update (C) date

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

ScriptMgr.cpp

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

ScriptMgr.h

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

ScriptSystem.cpp

Update (C) date

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

ScriptSystem.h

Refactored singletons to enable proper deconstruction during shutdown

2014-07-20 00:40:08 +02:00