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:
commit
9e9f708fd8
18 changed files with 2277 additions and 74 deletions
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include <string>
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <uv.h>
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue