 Luke Dashjr
|
83ed93c238
Merge branch 'scanser_all' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
c09e3dff66
Merge branch 'cgminer' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
5160a458c4
Merge commit 'd168' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d2701bc849
Merge commit '1b7db5b' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7a2d8c5293
Merge commit '0e0093e' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1db0118251
Merge commit '9bec1e1' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cf9eeac89f
Merge commit '4ca288e' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d5b0698f6c
Merge commit '0feb679' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1a40361690
Merge commit 'f63aeab' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
5be762d194
Merge commit '9de3a26' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
66b2f8aabf
Merge commit '3ceb57b' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1d9e6d2bb3
Merge commit '8ed381f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
2d6259c290
Merge commit 'b3cfe47' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
f3b4e3d7a3
Merge commit '08948e0' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7a0fab9508
Merge commit 'c01284f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
a5545e78fc
Merge commit '8fc701d' into bfgminer
|
13 years ago |
 ckolivas
|
afb99b674b
Free work before retrying in get_work_thread.
|
13 years ago |
|
Luke Dashjr
|
f04174c897
Merge commit '35cb7fd' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1141f97a27
Merge commit 'b622e97' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d286074379
Merge commit 'a9278ce' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
6a4ce68cb3
Merge commit '34b8dcb' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
22da046d71
Restore --retries feature for submissions only, where it makes sense.
|
13 years ago |
|
Luke Dashjr
|
41d1bdc851
Merge commit '1f295cd' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
877be483c4
Merge branch 'bfgminer-2.6.x' into bfgminer
|
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 |
