Carbenium b82a072b25 Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4 ...

Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt

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

..

Configuration

Update (C) date

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

Cryptography

Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4

2015-07-21 23:20:40 +02:00

Database

Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4

2015-07-21 23:35:43 +02:00

DataStores

Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

2015-07-21 21:45:04 +02:00

Debugging

Update (C) date

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

Dynamic

Update (C) date

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

Logging

Update (C) date

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

Networking

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

2015-07-21 20:05:44 +02:00

Packets

Update (C) date

2015-07-19 13:37:44 +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

Update (C) date

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

Utilities

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

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

CMakeLists.txt

Update (C) date

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

Common.cpp

Update (C) date

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

Common.h

Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4

2015-07-21 20:05:44 +02:00

CompilerDefs.h

Update (C) date

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

Containers.h

Update (C) date

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

Define.h

Update (C) date

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

Memory.h

Core: Fix non pch build

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

SystemConfig.h

Update (C) date

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