fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev'

Browse source
This commit is contained in:
XMRig 2020-05-23 11:08:53 +07:00
commit 0a7324f500
No known key found for this signature in database
GPG key ID: 446A53638BE94409
188 changed files with 1414 additions and 2597 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/crypto/rx/RxConfig.cpp
View file

@ -24,9 +24,9 @@
#include "crypto/rx/RxConfig.h"
#include "3rdparty/rapidjson/document.h"
#include "backend/cpu/Cpu.h"
#include "base/io/json/Json.h"
#include "rapidjson/document.h"
#ifdef XMRIG_FEATURE_HWLOC

2
src/crypto/rx/RxConfig.h
View file

@ -26,7 +26,7 @@
#define XMRIG_RXCONFIG_H
#include "rapidjson/fwd.h"
#include "3rdparty/rapidjson/fwd.h"
#ifdef XMRIG_FEATURE_MSR

6
src/crypto/rx/msr/MsrItem.cpp
View file

@ -7,8 +7,8 @@
* Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018-2019 tevador <tevador@gmail.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -26,7 +26,7 @@
#include "crypto/rx/msr/MsrItem.h"
#include "rapidjson/document.h"
#include "3rdparty/rapidjson/document.h"
#include <cstdio>

4
src/crypto/rx/msr/MsrItem.h
View file

@ -7,8 +7,8 @@
* Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018 Lee Clagett <https://github.com/vtnerd>
* Copyright 2018-2019 tevador <tevador@gmail.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by