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

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp

2013-05-30 20:57:07 +02:00

..

Configuration

Update copyright note for 2013.

2013-01-01 00:41:01 +01: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-05-30 20:57:07 +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/Misc: Apply codestyle to multiple files

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

Logging

Core: Fixed windows compile

2013-05-13 18:10:20 +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

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

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

AutoPtr.h

Update copyright note for 2013.

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

CMakeLists.txt

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

2013-03-25 13:26:48 +01: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

Core/DataStores: Implemented using locales in .db2 stores

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

Memory.h

Core: Fix non pch build

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

SystemConfig.h

Update copyright note for 2013.

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