 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
|
fa0dd2a70c
Merge branch 'bugfix_bf_hwe_main' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
71f85c67c3
Bugfix: bitforce: Always increment global hw error counter when incrementing device hwe
|
13 years ago |
|
Luke Dashjr
|
fcf0315e8c
Merge branch 'bugfix_MHz_x6500' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ff3ff551dc
Bugfix: x6500: Correct "MHz" capitalization
|
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
|
5286e06249
Merge branch 'cg_merges_20121203' into bfgminer
|
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
|
c99fe58346
windows-build: Corrections for BFGMiner
|
13 years ago |
|
Luke Dashjr
|
dfb17746c8
Merge commit '4fbe435' into cg_merges_20121203
|
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
|
763a83e3aa
Partial-Merge commit '16637ac' 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
|
30237289b8
Null-Merge commit '4584068' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
b55be16997
Merge commit 'fc66a41' into cg_merges_20121203
|
13 years ago |
|
Luke Dashjr
|
031dc7985f
Null-Merge commit 'b884354' into cg_merges_20121203
|
13 years ago |
