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
|
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 |
Con Kolivas
|
8bc7d1c9a0
Only try to adjust dev width when curses is built in.
|
13 years ago |
Luke Dashjr
|
3fbe93eca7
Merge commit '6bbd753' into bfgminer
|
13 years ago |
Luke Dashjr
|
00da219893
Merge commit '391e1f7' into bfgminer
|
13 years ago |
Luke Dashjr
|
965d484525
Merge commit 'ac45260' into bfgminer
|
13 years ago |
Luke Dashjr
|
56b40b59dc
Merge commit 'efcce5b' into bfgminer
|
13 years ago |
Luke Dashjr
|
2609e1724e
Merge commit 'b1cdacd' into bfgminer
|
13 years ago |
Luke Dashjr
|
826755ab24
Merge commit 'fd7b21e' into bfgminer
|
13 years ago |
Con Kolivas
|
8b3c20bc06
Abstract out ms to timeval as a function.
|
13 years ago |
Con Kolivas
|
93a7967ecb
Fix signedness warning.
|
13 years ago |
Con Kolivas
|
6b11d4e4cc
Merge pull request #252 from pshep/master
|
13 years ago |
Con Kolivas
|
67e92de18c
Adjust device width column to be consistent.
|
13 years ago |
Con Kolivas
|
ce93c2fc62
Use cgpu-> not gpus[] in watchdog thread.
|
13 years ago |