jl777 e73b2055c6 Merge branch 'beta' into mergemaster ...

# Conflicts:
#	src/main.cpp

2018-04-16 10:16:01 +03:00

..

equi_miner.h

Merge branch 'beta' into mergemaster

2018-04-16 10:16:01 +03:00

equi.h

Integrate Tromp solver into miner code and remove its dependency on extra BLAKE2b implementation.

2016-10-20 06:03:16 +01:00

osx_barrier.h

Add Tromp's implementation of Equihash solver

2016-10-20 06:00:30 +01:00