jl777
|
e73b2055c6
|
Merge branch 'beta' into mergemaster
# Conflicts:
# src/main.cpp
|
2018-04-16 10:16:01 +03:00 |
|
Jack Grigg
|
dccc140bf1
|
Comment out print statements in tromp's solver
This prevents the solver interfering with the metrics screen.
|
2016-10-22 15:59:44 -05:00 |
|
Daira Hopwood
|
c7aaab7aa3
|
Integrate Tromp solver into miner code and remove its dependency on extra BLAKE2b implementation.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-10-20 06:03:16 +01:00 |
|
Daira Hopwood
|
ae10ed9c4f
|
Add Tromp's implementation of Equihash solver
(as of tromp/equihash commit 690fc5eff453bc0c1ec66b283395c9df87701e93).
Author: John Tromp <john.tromp@gmail.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
|
2016-10-20 06:00:30 +01:00 |
|