Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

Browse Source 
Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt
This commit is contained in:
Carbenium committed 2015-07-21 23:46:56 +02:00
2 parents e44401c292 bba8555a29
commit b82a072b25
41 files changed
+813 -1193
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dep/PackageList.txt
+4
View File
@@ -8,6 +8,10 @@ bzip2 (a freely available, patent free, high-quality data compressor)
http://www.bzip.org/
Version: 1.0.6
cppformat (type safe format library)
https://github.com/cppformat/cppformat
Version: 1.1.0 da547f5533f338cc0c65877b44ca40adf31754f7
G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
http://g3d.sourceforge.net/
Version: 9.0-Release r4036