 Luke Dashjr
|
c15e4f99a0
Merge branch 'stratum_clean_reuse' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
17b1ecab35
Merge branch 'cg_merges_20121203' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
46a044eb5c
Merge commit 'b86aa20' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
ecee542954
Merge branch 'stratum_transparency' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
0cef2fd5d4
Merge commit '24a90d4' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
24a90d40b9
Bugfix: Copy sd later since s was not yet allocated with new code
|
13 years ago |
|
Luke Dashjr
|
3bf695a9d9
Merge branch 'tmpl_nonce' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
505a5893aa
Count template number, and append it to the coinbase of templates without any cbtxn
|
13 years ago |
|
Luke Dashjr
|
9a2e52858c
Merge branch 'bugfix_MHz' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
cd9ed24366
Merge commit '3cf6837' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3cf68370bf
Bugfix: Correct order of printf-style arguments in cbappend fail
|
13 years ago |
|
Luke Dashjr
|
97c4821612
Bugfix: Capitalize "MHz" correctly
|
13 years ago |
|
Luke Dashjr
|
180460f258
Merge commit '777f057' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
724d3ab764
Partial-Merge commit 'c4b17ae' into cg_merges_20121203 (move code around)
|
13 years ago |
|
Luke Dashjr
|
332c5f5d4d
Bugfix: Not using cgminer GBT implementation
|
13 years ago |
|
Luke Dashjr
|
1de2fea4ee
Merge commit '401357e' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
c33702ca36
Merge commit '289d680' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
16d75b80df
Merge commit '4b28c85' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
6b24700b69
Merge commit 'f4d305a' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
080295f681
Partial-Merge commit '1ad671b' into cg_merges_20121203 (dynamically allocate getwork submissions)
|
13 years ago |
|
Luke Dashjr
|
e9d4b5e7bb
Merge commit 'fc5d3a0' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
ffd1e4cf97
Partial-Merge commit '9a71654' into cg_merges_20121203 (rename rename_thr to RenameThread)
|
13 years ago |
|
Luke Dashjr
|
2e80e5c13f
Partial-Merge commit '28f251e' into cg_merges_20121203 (noop usbutils, and modminer symbolic command names)
|
13 years ago |
|
Luke Dashjr
|
b82896e4c9
Merge commit 'cc14f16' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
de6ab25a61
Merge commit '53c9cda' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
35a3384bb3
Merge commit '01eb807' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
e92a6f9e37
Partial-Merge commit 'bc4f6d9' into cg_merges_20121203 (just longpoll work)
|
13 years ago |
|
Luke Dashjr
|
f55248a162
Merge branch 'bugfix_gbt_expire0' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
6342458c4a
Bugfix: Assign header-based rolltime before decoding work, so GBT expires overrides it properly
|
13 years ago |
|
Luke Dashjr
|
c76d880070
Merge commit 'c34ff36' into cg_merges_20121125
|
13 years ago |
