BenDroid 563fdf6485 Merge branch 'master' ... Conflicts: src/net/Client.cpp		2018-03-02 23:22:06 +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	Merge branch 'master'	2018-03-02 23:22:06 +01:00
NetworkState.h	Added SSL/TLS support to stratum communication	2018-02-25 22:06:40 +01:00