 Luke Dashjr
|
88733e7c8f
Initial libblkmaker integration, using a git submodule
|
13 years ago |
|
Luke Dashjr
|
e6b6d8816d
Merge branch 'cairnsmore' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
8445ce898f
cairnsmore: Beginnings of new driver, with automatic upgrade from Icarus detection
|
13 years ago |
|
Luke Dashjr
|
460b36c7bb
Merge branch 'pool_proxy' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1209860749
Merge commit 'fea3ca9' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
fea3ca9414
Bugfix: Update current_block_id for fixed set_curblock
|
13 years ago |
|
Luke Dashjr
|
29dabe75f5
proxy: Replace mess of encoding proxy into pool URI with a --pool-proxy option, and use cURL's builtin proxy URI support
|
13 years ago |
 Kano
|
8122cd316b
save individual pool proxy settings to config
|
13 years ago |
|
Kano
|
468fe9927c
CURL support for individual proxy per pool and all proxy types
|
13 years ago |
|
Kano
|
9c68244e45
API add display of and setting queue,scantime,expiry
|
13 years ago |
|
Luke Dashjr
|
81b0860e0c
Merge commit '93555e2' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
a25dffde18
Merge branch 'bugfix_blkhash_sanitize' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
956cb596a0
Merge branch 'bugfix_oldblkhash' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
25ba8151d3
Merge branch 'bugfix_blkcmp' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
da48981629
Merge branch 'userpass_mix' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
037dbde1d9
Merge branch 'bugfix_1pool_backwash_flood' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3fada6a0e2
Bugfix: Tolerate working on old blocks when there is only one pool enabled
|
13 years ago |
|
Luke Dashjr
|
506c864afd
Merge branch 'bugfix_cfg_strtok' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
60285bcd8f
Merge commit '2bf08bb' into rpc_debug
|
13 years ago |
|
Luke Dashjr
|
3467912c6b
Merge commit '57c3b12' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
e070c9af4a
Merge commit 'b34f36b' into bfgminer
|
13 years ago |
|
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
|
a5d5333839
Merge commit '67761ca' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
7d0cc8aee0
Merge commit '4ab87d8' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
44f70e1828
Merge commit '4d90a55' into bfgminer-2.6.x
|
13 years ago |
