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
This commit is contained in:
BenDroid 2017-12-03 21:17:56 +01:00
commit 9e9f708fd8
18 changed files with 2277 additions and 74 deletions

View file

@ -24,6 +24,7 @@
#include <string>
#include <inttypes.h>
#include <stdio.h>
#include <uv.h>