 Luke Dashjr
|
a321db7691
Merge commit '274a401' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
95a5e7ab6d
Merge commit '96183bb' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
5819cf5fb5
Merge commit '75eca07' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
87edc7a67e
Merge commit 'e5aba76' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
000aeb2b15
Merge commit 'ba5c1fc' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
524dd1515c
Merge commit '8766bca' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
e6025c30d1
Merge commit '6314a12' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
243c73eb01
Merge commit 'a9746b9' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
c59fbb6511
Merge commit '7046c97' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
acdfdcb6ac
Merge branch 'bugfix_bfl_discard' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ec90bcf5f1
Bugfix: BFL loses work if exiting scanhash early, so don't
|
13 years ago |
|
Luke Dashjr
|
cbfc12d462
icarus: Adopt some trivial and useless code from CGMiner to make merges cleaner
|
13 years ago |
|
Luke Dashjr
|
94a854ce9c
Merge branch 'cgminer' into bfgminer
|
13 years ago |
 Con Kolivas
|
274a40115e
Merge branch 'master' into mr
|
13 years ago |
|
Con Kolivas
|
892e9bf88a
Merge pull request #253 from pshep/master
|
13 years ago |
 Paul Sheppard
|
1ee191a726
limit clear buffer iterations.
|
13 years ago |
|
Luke Dashjr
|
5cdb59a354
Merge branch 'bugfix_bfl_discard' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
64bd06724d
bitforce: Revert "discard job on work restart request" since it loses good shares
|
13 years ago |
|
Luke Dashjr
|
81e39cc7de
Merge branch 'cgminer' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
91b8fc6ad3
Merge branch 'cgminer' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d33ecc3cf4
Merge commit '6b11d4e' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
e853efe868
Merge commit '67e92de' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
8767425f7a
Merge commit '732783f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
b880a0a854
Merge commit '8b05008' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
c3526786ab
Merge commit '2ec0fb9' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
949e801655
Restore devdetail (including info on driver, kernel, model, and device path)
|
13 years ago |
|
Luke Dashjr
|
4003ef7a5f
Restore devstatus refactoring and moving details to device code
|
13 years ago |
|
Luke Dashjr
|
5cf2b2b360
INCOMPLETE Merge commit 'eab9deb' into bfgminer
|
13 years ago |
 Paul Sheppard
|
2aa95ab812
Merge branch 'master' of git://github.com/ckolivas/cgminer.git
|
13 years ago |
|
Paul Sheppard
|
54f8554af4
Ad fd check to clear buffer.
|
13 years ago |
