 Luke Dashjr
|
202c6c1ab5
Fake-Merge commit '1321cb0' into cg_gbt_skip
|
13 years ago |
|
Luke Dashjr
|
a714579c9c
Merge branch 'cg_gbt_skip' into cg_gbt_skip
|
13 years ago |
|
Luke Dashjr
|
0717f7a640
Merge commit 'ffb8a29' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d664097c67
Merge branch 'stratum_transparency' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
da8972cc14
Merge branch 'stratum_transparency' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
e4bf5cba4c
Merge remote-tracking branch 'cgminer/gbt' into cg_gbt_skip
|
13 years ago |
|
Luke Dashjr
|
5188eab00e
Revert "ztex: Silence false "unexpected" hardware errors"
|
13 years ago |
|
Luke Dashjr
|
6085550afc
Merge branch 'dev_x6500' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
44818d8aea
Implement new --force-dev-init option to force bitstream upload to modminer and x6500 devices
|
13 years ago |
|
Luke Dashjr
|
8cd26a5cf5
Bugfix: x6500: Include --scan-serial option even for x6500-only builds
|
13 years ago |
|
Luke Dashjr
|
7b89d40260
Merge branch 'ztex_S_noauto' into dev_x6500
|
13 years ago |
|
Luke Dashjr
|
3c1112b9ef
Merge branch 'ztex_hwe_silence' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ee4802e1c9
ztex: Silence false "unexpected" hardware errors
|
13 years ago |
|
Luke Dashjr
|
c12d352d32
Merge branch 'gbt_solo' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
133c0d0781
When we find a block, always progress to it for mining
|
13 years ago |
|
Luke Dashjr
|
d9c0b0a991
Merge branch 'bugfix_regen_endian' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
32032d18d9
Bugfix: Enforce --expiry, but split --expiry-lp for a longer expiry on longpoll setups
|
13 years ago |
|
Luke Dashjr
|
6150c8acb1
Merge branch 'stratum' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3668cf7a93
Bugfix: Always fail scrypt detection if Stratum is working
|
13 years ago |
|
Luke Dashjr
|
1871e2d36c
Merge branch 'dev_x6500' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
8abe941963
Bugfix: Scan for ft232r devices later, after console lock and other mutexes are initialized properly
|
13 years ago |
|
Luke Dashjr
|
b4ed6d0028
Merge branch 'bugfix_leak_deciphail' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1522430890
Bugfix: Release job JSON result as soon as we are done using it
|
13 years ago |
|
Luke Dashjr
|
b79c6a6567
Merge branch 'bugfix_workcpy_drivstrat' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
52e1b52902
Bugfix: Use clear_work and workdup everywhere work is copied around
|
13 years ago |
|
Luke Dashjr
|
3ed6656aed
Merge branch 'bugfix_clr_work_replaced' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
78e7924e2f
Bugfix: Clear work before replacing it with new, to free any pointers
|
13 years ago |
|
Luke Dashjr
|
24d10ec705
Merge branch 'bugfix_leak_deciphail' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
56918f4ebc
Bugfix: Release job JSON result as soon as we are done using it
|
13 years ago |
|
Luke Dashjr
|
6c63b68af0
Merge commit 'e19c5d9' into bfgminer
|
13 years ago |
