Vincent-Michael 56bd42dcf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp

2013-07-15 18:04:04 +02:00

..

Configuration

Core/Config: Refactored ConfigMgr

2013-07-15 17:31:44 +02:00

Cryptography

Core/Misc: Fixed a bunch of issues found by static analysis

2013-05-17 20:39:53 +02:00

Database

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

2013-06-11 22:07:11 +02:00

DataStores

Merge branch 'master' into 4.3.4 (Only the Logging System One)

2013-05-21 09:55:09 +02:00

Debugging

Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes

2013-05-21 08:37:28 +02:00

Dynamic

Core: More Function Renaming.

2013-06-11 21:25:12 -02:30

Logging

Core/Config: Refactored ConfigMgr

2013-07-15 17:31:44 +02:00

Packets

Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict)

2013-05-21 11:27:12 +02: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/Misc: Fixed a bunch of issues found by static analysis

2013-05-17 20:39:53 +02:00

Utilities

Revert "Shared/Utils: Fixed ApplyPercentModFloatVar."

2013-07-11 11:10:05 +02: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

Core/DataStores: Implemented using locales in .db2 stores

2013-03-17 16:04:52 +01:00

CompilerDefs.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01: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