Spp 0e8011657d Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h

2013-01-16 15:29:41 +01:00

..

Configuration

Update copyright note for 2013.

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

Cryptography

Core/Misc: Apply codestyle to multiple files

2013-01-14 09:50:59 +01:00

Database

Merge branch 'master' into 4.3.4

2013-01-03 09:17:53 +01:00

DataStores

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +01:00

Debugging

Update copyright note for 2013.

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

Dynamic

Core/Misc: Apply codestyle to multiple files

2013-01-14 09:50:59 +01:00

Logging

Core/Logging: Add config option to enable/disable asyncronous logging (disabled by default)

2013-01-16 09:52:49 +01:00

Packets

Core/Misc: Apply codestyle to multiple files (II)

2013-01-14 11:12:58 +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

Update copyright note for 2013.

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

Utilities

Merge branch 'master' into 4.3.4

2013-01-14 11:04:03 +01:00

AutoPtr.h

Update copyright note for 2013.

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

CMakeLists.txt

Update copyright note for 2013.

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

Common.cpp

Update copyright note for 2013.

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

Common.h

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

CompilerDefs.h

Update copyright note for 2013.

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

Containers.h

Update copyright note for 2013.

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

Define.h

Merge branch 'master' into 4.3.4

2013-01-02 13:30:51 +01:00

SystemConfig.h

Update copyright note for 2013.

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