Merge remote-tracking branch 'refs/remotes/xmrig/master'

Conflicts:
	CHANGELOG.md
	README.md
	src/version.h
This commit is contained in:
BenDroid 2018-01-19 19:25:31 +01:00
commit 990bf8d963
2 changed files with 13 additions and 2 deletions

View file

@ -36,6 +36,11 @@
#endif
#ifndef XMRIG_NO_HTTPD
# include <microhttpd.h>
#endif
#include "Cpu.h"
#include "donate.h"
#include "net/Url.h"
@ -832,6 +837,10 @@ void Options::showVersion()
"\n");
printf("\nlibuv/%s\n", uv_version_string());
# ifndef XMRIG_NO_HTTPD
printf("libmicrohttpd/%s\n", MHD_get_version());
# endif
}