REDACTED-rig/src/3rdparty
BenDroid 06328c5541 Merge remote-tracking branch 'refs/remotes/xmrig/master'
Conflicts:
	CHANGELOG.md
	src/Options.h
	src/Platform_unix.cpp
	src/log/ConsoleLog.cpp
	src/version.h
2017-12-03 21:17:56 +01:00
..
cpp-httplib Fixed compiling for msys2 2017-11-17 20:56:27 +01:00
getopt Fix Visual Studio warnings. 2017-08-14 09:30:41 +03:00
libcpuid Add missing file. 2017-06-15 18:09:29 +03:00
rapidjson libjansson replaced to rapidjson. 2017-10-04 23:33:30 +03:00
align.h Initial MSVC support. 2017-06-12 16:19:07 +03:00
aligned_malloc.h Added ARMv8 (aarch64) support. 2017-11-06 03:11:35 +03:00