Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4
Conflicts: README.md sql/base/auth_database.sql sql/updates/world/2014_12_27_01_world_335.sql src/server/game/Conditions/ConditionMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Server/WorldSession.cpp src/server/scripts/Commands/cs_misc.cpp src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp src/server/scripts/Spells/spell_hunter.cpp
This commit is contained in:
commit
79eb80dcba
71 files changed
+1652
-1862
No files matched your search
+1
-1
@@ -26,7 +26,7 @@ utf8-cpp (UTF-8 with C++ in a Portable Way)
|
||||
|
||||
zlib (A Massively Spiffy Yet Delicately Unobtrusive Compression Library)
|
||||
http://www.zlib.net/
|
||||
Version: 1.2.7
|
||||
Version: 1.2.8
|
||||
|
||||
gSOAP (a portable development toolkit for C and C++ XML Web services and XML data bindings)
|
||||
http://gsoap2.sourceforge.net/
|
||||
|
||||
Reference in new issue
Block a user