Luke Dashjr
|
a5d5333839
Merge commit '67761ca' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
7d0cc8aee0
Merge commit '4ab87d8' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
44f70e1828
Merge commit '4d90a55' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
3d1ca6f118
Merge commit '73d35cb' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
e9e6e346e4
Merge commit 'd5a08e5' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
0719f75e8c
Merge commit 'a529b8a' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
ef156b9139
Merge commit '68cd0e8' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
e979e6c1da
Merge commit '74f2112' into bfgminer-2.6.x
|
13 years ago |
Kano
|
bdd05dbc61
API new command 'coin' with mining information
|
13 years ago |
Con Kolivas
|
799a2be135
Add message to share if it's a resubmit.
|
13 years ago |
Luke Dashjr
|
ebef3d3810
Revert stale-on-arrival failsafe, since it ends up needing exceptions for everything
|
13 years ago |
Luke Dashjr
|
6d887fc01c
Merge branch 'failsafe_soa' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
cc47486b69
Merge branch 'submitthr' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
2b7661d39a
Bugfix: Use a new POOL_STALE flag to handle stale-on-arrival disabling, instead of piggybacking on POOL_REJECTING
|
13 years ago |
Luke Dashjr
|
24fafd0f58
Bugfix: Don't warn for stale-on-arrival work if the pool is already disabled for it
|
13 years ago |
Luke Dashjr
|
40400be160
Merge branch 'ocl_dyn_timeBeginPeriod' into bfgminer-2.6.x
|
13 years ago |
Luke Dashjr
|
de73e0fcf4
opencl: Use timeBeginPeriod on Windows to ensure gettimeofday has sufficient precision for dynamic intensity
|
13 years ago |
Con Kolivas
|
d2e93ca636
Don't try to start devices that don't support scrypt when scrypt mining.
|
13 years ago |
Luke Dashjr
|
4c0ae57af1
Merge commit '70c57e7' into bfgminer
|
13 years ago |
Luke Dashjr
|
b7180e4fca
Merge commit 'd66742a' into bfgminer
|
13 years ago |
Luke Dashjr
|
694ab3dfeb
Merge commit 'c91a954' into bfgminer
|
13 years ago |
ckolivas
|
2731622696
Don't make mandatory work and its clones last forever.
|
13 years ago |
Luke Dashjr
|
f99362da7f
Merge remote-tracking branch 'kanoi/main' into bfgminer
|
13 years ago |
Luke Dashjr
|
f98bbbffaa
Merge branch 'bugfix_submitting_mutexinit' into bfgminer
|
13 years ago |
Luke Dashjr
|
3585a96dbb
Merge branch 'cgminer' into bfgminer
|
13 years ago |
Luke Dashjr
|
b84119c8bc
Merge branch 'bugfix_cancel_mutex' into bfgminer
|
13 years ago |
Luke Dashjr
|
a0ed5ce3b8
Merge branch 'rename_thr' into bfgminer
|
13 years ago |
Luke Dashjr
|
abf3539a01
Merge branch 'bugfix_1getwork' into bfgminer
|
13 years ago |
Luke Dashjr
|
d24878e9cb
Merge branch 'submitthr' into bfgminer
|
13 years ago |
Luke Dashjr
|
3a5a34a3e9
Merge branch 'refactor_stale' into bfgminer
|
13 years ago |