 Luke Dashjr
|
e5f2ed1520
Merge commit '944af31' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
7119479adc
Merge commit 'dd4e515' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
5e5adc12b8
Merge commit 'd3bfee1' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
0bcaea174a
Merge commit 'fedf0f1' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
de596cd6ff
Merge commit '98151b2' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
30175b568b
Merge commit 'f0c1782' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
3fc26f201f
Semi-Merge commit '93e3c16' into cg_merges_20121226 (mergability only)
|
13 years ago |
|
Luke Dashjr
|
2cdd55b8dc
Merge commit 'deb9aec' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
c59bb95807
Semi-Merge commit '54e218b' into cg_merges_20121226 (just mergability)
|
13 years ago |
|
Luke Dashjr
|
38f4659fb5
Semi-Merge commit '9fd60bb' into cg_merges_20121226 (just add checking staged_rollable inside stgd_lock)
|
13 years ago |
|
Luke Dashjr
|
13029f8e1d
Merge commit 'd91dc18' into cg_merges_20121226
|
13 years ago |
|
Luke Dashjr
|
aa17f0c746
Merge commit 'a1d6abc' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
05aa885c84
Merge branch 'gbt_eff' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
9e69c4c58e
Bugfix: Update last GBT work in pool_active before staging it, since otherwise it could possibly be consumed before we copy it
|
13 years ago |
|
Luke Dashjr
|
f1b647e481
Merge branch 'bugfix_format' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3895928811
Bugfix: Address Windows-specific formatting issues (including lack of support for %ll*)
|
13 years ago |
|
Luke Dashjr
|
3ac7f71f39
Merge branch 'bugfix_format' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
18e0e8bdd4
Follow strict time_t handling rules
|
13 years ago |
|
Luke Dashjr
|
d36932170a
Merge branch 'submit_async' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
93d9cc8d9f
Bugfix: submissions: Skip FD_ISSET when fd==-1 (let the next select setup deal with cleaning them out)
|
13 years ago |
|
Luke Dashjr
|
53f347cbff
Merge commit 'ac55fb0' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
ac55fb0c25
Bugfix: Remove sws from write_sws list when discarding it due to pre-send stratum disconnection
|
13 years ago |
|
Luke Dashjr
|
d986d4ee80
Merge branch 'cgminer' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
7b291da674
Merge commit 'a07e015' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
6d70c591fa
Merge commit 'a7128e0' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
f7f1b0c3be
Merge commit '4f1f5c8' into cg_merges_20121219
|
13 years ago |
|
Luke Dashjr
|
2c73e271fc
Merge commit '1926790' into cg_merges_20121218
|
13 years ago |
|
Luke Dashjr
|
410ef0ff1a
Merge commit '14457a0' into cg_merges_20121218
|
13 years ago |
|
Luke Dashjr
|
9a343919f3
Merge commit '3b91033' into cg_merges_20121218
|
13 years ago |
|
Luke Dashjr
|
bf040338ec
Merge commit '9ef73d9' into cg_merges_20121217
|
13 years ago |
