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

Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.h
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

2013-12-08 20:27:46 +01:00

..

Configuration

Core/Logging: Extend logging system to allow inheritance of loggers

2013-11-07 16:34:44 +01:00

Cryptography

Core/Misc: Fix some static analysis issues

2013-12-01 16:19:30 +01:00

Database

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

2013-12-08 20:27:46 +01:00

DataStores

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

2013-12-08 20:27:46 +01:00

Debugging

Auth/Misc: Code cleanup.

2013-09-02 19:40:31 +03:00

Dynamic

Core/Code: Unify [more] codestyle for brackets: )\n{\n} to ) { }.

2013-10-28 14:36:07 -04:00

Logging

Core/Logging: Minor changes

2013-11-11 14:35:16 +01:00

Packets

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

PrecompiledHeaders

Core: Adjust precompiled headers: Remove a few already defined/included headers in the shared PCH-file (already included from Common.h)

2010-12-23 17:20:56 +01:00

Threading

Core/Code: Unify [more] codestyle for brackets: )\n{\n} to ) { }.

2013-10-28 14:36:07 -04:00

Utilities

Merge branch 'master' into 4.3.4

2013-11-08 11:12:17 +01:00

AutoPtr.h

Update copyright note for 2013.

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

CMakeLists.txt

Buildsystem/MSVC

2013-06-15 14:07:12 +02:00

Common.cpp

Update copyright note for 2013.

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

Common.h

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

2013-09-11 22:35:45 +02:00

CompilerDefs.h

Shared/Build: Restore disabled warnings on Visual Studio

2013-09-15 19:23:35 +02:00

Containers.h

Core/Misc: Minor optimizations (+code changes to reduce differences with 4.3.4 branch)

2013-03-25 13:26:48 +01:00

Define.h

Merge remote-tracking branch 'origin/master' into 4.3.4

2013-07-14 16:10:20 +01:00

Memory.h

Core: Fix non pch build

2013-01-02 13:58:36 +01:00

SystemConfig.h

Build: Set _BUILD_DIRECTIVE even if the compiler is not properly detected

2013-06-27 10:47:30 +02:00