diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-19 22:57:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-19 22:57:44 +0200 |
| commit | 910f32d48ddbae2ec8f2e85b678ade60ff04c8fa (patch) | |
| tree | 6f3a8732e335240bb26c9b5fdca0a9733090657a /dep/PackageList.txt | |
| parent | 34572492dd1394dbeaf19bb697a7af8cbf0b6ef7 (diff) | |
| parent | 57069b393d7698bc0f860ad1b2d0b16785f9e8e0 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
Diffstat (limited to 'dep/PackageList.txt')
| -rw-r--r-- | dep/PackageList.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/PackageList.txt b/dep/PackageList.txt index 879324144f6..18f14f18e32 100644 --- a/dep/PackageList.txt +++ b/dep/PackageList.txt @@ -14,7 +14,7 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License) jemalloc (a general-purpose scalable concurrent malloc-implementation) http://www.canonware.com/jemalloc/ - Version: 3.5.1 + Version: 3.6.0 MySQL (the world's most popular open source database software) http://www.mysql.com/ |