mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-18 03:46:18 -05:00
Code Issues Projects Releases Wiki Activity

Resolved conflicts

Browse Source
This commit is contained in:
MoneroOcean
2019-09-28 20:26:20 -07:00
parent 47ba0a015b 467e5115b0
commit d03fb91b0a
82 changed files with 3489 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/crypto/common/Algorithm.cpp
View File

@@ -103,9 +103,8 @@ static AlgoName const algorithm_names[] = {
{ "cryptonight_turtle", "cn_turtle", Algorithm::CN_PICO_0 },
# endif
# ifdef XMRIG_ALGO_RANDOMX
{ "randomx/0", "rx/0", Algorithm::RX_0 },
{ "randomx/test", "rx/test", Algorithm::RX_0 },
{ "randomx/0", "rx/0", Algorithm::RX_0 },
{ "randomx/0", "rx/0", Algorithm::RX_0 },
{ "RandomX", "rx", Algorithm::RX_0 },
{ "randomx/wow", "rx/wow", Algorithm::RX_WOW },
{ "RandomWOW", nullptr, Algorithm::RX_WOW },