 Luke Dashjr
|
80154fd190
Merge commit 'cbef2a6' into bfgminer
|
14 years ago |
|
Luke Dashjr
|
571f0208df
Merge commit '0ed757a' into bfgminer
|
14 years ago |
|
Luke Dashjr
|
da76164f63
Merge commit '31ddad6' into bfgminer
|
14 years ago |
 Con Kolivas
|
cdf325d751
Merge branch 'master' of github.com:ckolivas/cgminer
|
14 years ago |
|
Con Kolivas
|
ac55cec60b
Fix whitespace mangling.
|
14 years ago |
|
Con Kolivas
|
c1c99f1dd2
Merge https://github.com/pshep/cgminer into pshep
|
14 years ago |
|
Con Kolivas
|
89e613b943
Revert "Change BFL driver thread initialising to a constant 100ms delay between devices instead of a random arrangement."
|
14 years ago |
|
Con Kolivas
|
94628b1d1c
Merge pull request #265 from kanoi/minerphp
|
14 years ago |
 Kano
|
09bdf81644
miner.php fix rig # when miners fail
|
14 years ago |
|
Con Kolivas
|
cbef2a6a65
Only try to shut down work cleanly if we've successfully connected and started mining.
|
14 years ago |
|
Con Kolivas
|
0ed757a020
Use switch statement for cgpu->status and fix spelling.
|
14 years ago |
|
Con Kolivas
|
31ddad67b6
Merge pull request #263 from luke-jr/bugfix_nmsleep
|
14 years ago |
|
Con Kolivas
|
96f3a98838
Merge pull request #264 from luke-jr/life_init
|
14 years ago |
|
Con Kolivas
|
f168d9696e
Merge pull request #262 from luke-jr/bugfix_ocl_err
|
14 years ago |
|
Con Kolivas
|
c16ff2e988
Merge pull request #258 from zefir-k/master
|
14 years ago |
|
Con Kolivas
|
b3d8575cbe
Merge pull request #260 from kanoi/minerphp
|
14 years ago |
|
Luke Dashjr
|
96c8742cae
Merge branch 'mm_init_clock' into bfgminer
|
14 years ago |
|
Luke Dashjr
|
bdd4de7a2a
modminer: Firmware returns 0xffffff00 immediately if we set clockspeed too high
|
14 years ago |
|
Luke Dashjr
|
69dd1511e1
Merge branch 'bugfix_mm_hweratio' into bfgminer
|
14 years ago |
|
Luke Dashjr
|
0c00a665df
Bugfix: modminer: Actually count good shares
|
14 years ago |
|
Luke Dashjr
|
feaf9fbfac
Merge branch 'bugfix_ocl_err' into bfgminer
|
14 years ago |
 Paul Sheppard
|
802342a58e
Remove bitforce_thread_init
|
14 years ago |
|
Luke Dashjr
|
10ef5b116a
Merge CGMiner pull request #258 from zefir-k/master
|
14 years ago |
|
Paul Sheppard
|
d4d5b28e5f
Abbrv. correction
|
14 years ago |
|
Luke Dashjr
|
ec6e6defb8
Bugfix: Use const struct device_api* for mt_disable
|
14 years ago |
|
Luke Dashjr
|
b5e7df122c
Merge branch 'mm_progress' into bfgminer
|
14 years ago |
|
Luke Dashjr
|
27c2b1ec9f
modminer: Show progress of bitstream upload
|
14 years ago |
|
Luke Dashjr
|
b92588f8c3
Merge branch 'life_init' into bfgminer
|
14 years ago |
|
Luke Dashjr
|
c57c308d1f
Bugfix: Don't declare devices SICK if they're just busy initializing
|
14 years ago |
|
Luke Dashjr
|
e7af0cc67f
Merge branch 'bugfix_nmsleep' into bfgminer
|
14 years ago |
