 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 |
|
Luke Dashjr
|
3d1ca6f118
Merge commit '73d35cb' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
e9e6e346e4
Merge commit 'd5a08e5' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
0719f75e8c
Merge commit 'a529b8a' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
ef156b9139
Merge commit '68cd0e8' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
e979e6c1da
Merge commit '74f2112' into bfgminer-2.6.x
|
13 years ago |
|
Luke Dashjr
|
cf9eeac89f
Merge commit '4ca288e' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d5b0698f6c
Merge commit '0feb679' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1a40361690
Merge commit 'f63aeab' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
5be762d194
Merge commit '9de3a26' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
66b2f8aabf
Merge commit '3ceb57b' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1d9e6d2bb3
Merge commit '8ed381f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
2d6259c290
Merge commit 'b3cfe47' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
f3b4e3d7a3
Merge commit '08948e0' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7a0fab9508
Merge commit 'c01284f' into bfgminer
|
13 years ago |
