BenDroid 9e9f708fd8 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
..
Api.cpp	Merge remote-tracking branch 'xmrig/master' into feature_cc	2017-10-07 20:05:56 +02:00
Api.h	libjansson replaced to rapidjson.	2017-10-04 23:33:30 +03:00
ApiState.cpp	#204 Fix Linux build, again.	2017-11-17 22:44:36 +03:00
ApiState.h	Fix clang warnings and job comparison bug.	2017-10-07 18:58:04 +03:00
Httpd.cpp	Merge remote-tracking branch 'xmrig/master' into feature_cc	2017-10-07 20:05:56 +02:00
Httpd.h	Added API authorization via Bearer token.	2017-09-02 08:18:24 +03:00
NetworkState.cpp	#196 Fix Linux build.	2017-11-17 12:59:46 +03:00
NetworkState.h	Added connection statistics to API.	2017-09-02 05:47:30 +03:00