Merge branch 'base-update' into dev

This commit is contained in:
XMRig 2020-05-03 13:32:12 +07:00
commit a0eb766238
No known key found for this signature in database
GPG key ID: 446A53638BE94409
115 changed files with 304 additions and 461 deletions

View file

@ -24,7 +24,7 @@
#include "base/io/json/Json.h"
#include "rapidjson/document.h"
#include "3rdparty/rapidjson/document.h"
#include <cassert>