 Luke Dashjr
|
0bc95b65da
Merge branch 'bigendian' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
b65401c390
Merge branch 'cgminer' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1e75ae47bf
Merge commit 'c91148f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
a8d26db4c5
Merge branch 'bigendian' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
6e0d6ab55c
Merge branch 'bfgminer-2.5.x' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7756362fd1
Merge branch 'bugfix_slowsick' into bfgminer-2.5.x
|
13 years ago |
|
Luke Dashjr
|
c7aeaf6836
Autoselect --scrypt iff all pools send scrypt work
|
13 years ago |
|
Luke Dashjr
|
e16b65c333
Remove mentions of Litecoin specifically
|
13 years ago |
|
Luke Dashjr
|
40253055f0
Bugfix: Fix build without OpenCL but with scrypt
|
13 years ago |
|
Luke Dashjr
|
cad7dbc2b6
Merge commit 'b5517af' into scrypt
|
13 years ago |
|
Luke Dashjr
|
a208d3fbae
Merge commit '2fb95c0' into scrypt
|
13 years ago |
|
Luke Dashjr
|
c653dd642c
Merge commit '808f403' into scrypt
|
13 years ago |
|
Luke Dashjr
|
3097e34480
Merge commit '537b28d' into scrypt
|
13 years ago |
|
Luke Dashjr
|
8162547379
Merge commit 'a5ebb71' into scrypt
|
13 years ago |
|
Luke Dashjr
|
44c7c3f922
Merge commit 'ea444d0' into scrypt
|
13 years ago |
|
Luke Dashjr
|
a0198c1502
Merge commit 'aabc723' into scrypt
|
13 years ago |
|
Luke Dashjr
|
5eea3f213f
Merge branch 'non-scrypt' into bfgminer
|
13 years ago |
 Con Kolivas
|
6896052881
Limit total number of curls recruited per pool to the number of mining threads to prevent blasting the network when we only have one pool to talk to.
|
13 years ago |
|
Luke Dashjr
|
b8a55e5acf
Merge branch 'bugfix_cfg_invgpuplat' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
66cf470884
Merge branch 'bugfix_defcfg' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
4eb92d05cf
Bugfix: Correctly attempt to load ~/.bfgminer/bfgminer.conf or ~/.cgminer/cgminer.conf as defaults
|
13 years ago |
|
Luke Dashjr
|
1075fc456d
Merge branch 'bf_stale_wait' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ce644d736c
bitforce: Abandon (only) stale searches for work restarts
|
13 years ago |
|
Luke Dashjr
|
78321f3487
Merge branch 'non-scrypt' into bfgminer
|
13 years ago |
|
Con Kolivas
|
6289c7c60f
Keep a counter of enabled pools and use that instead of iterating over the pool list. Use that value to ensure we don't set the last remaining active pool to the rejecting state.
|
13 years ago |
|
Luke Dashjr
|
a3582ab411
Merge branch 'refactor_stale' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
678a51f786
Merge branch 'bugfix_blkfndpool' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
0e0fc35e9e
Merge branch 'cfg_json_types' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
4ae2442831
Merge branch 'bugfix_mm_nonce' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cfa3e28b2d
Merge branch 'life_wait' into bfgminer
|
13 years ago |
