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

Conflicts:
	dep/PackageList.txt
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h

2014-06-26 00:13:34 +02:00

..

acelite

Dep/ACE: Fix assertion triggered on shutdown

2014-03-02 14:06:05 +01:00

bzip2

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

g3dlite

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

gsoap

Core/Dependencies: Update gsoap-library to v2.8.17r

2014-06-22 14:33:51 +02:00

jemalloc

Core/Dependencies: Upgrade to jemalloc-3.6.0

2014-06-19 22:20:55 +02:00

mysqllite

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

recastnavigation

Core/MMAPs: Update recast

2014-06-25 22:04:06 +02:00

SFMT

SQL: Rename SQL merged in PR

2013-01-23 20:29:40 +01:00

StormLib

Core/Build: Remove some more unneeded code for OS X from cmake files

2012-11-12 10:29:52 +01:00

utf8cpp

Core/Dependencies: Update utf8-cpp to version 2.3.4

2013-07-20 14:55:25 +01:00

zlib

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

PackageList.txt

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

2014-06-26 00:13:34 +02:00