 Luke Dashjr
|
929de15e5b
Merge commit '6e2e7d3' into cg_merges_20121231
|
13 years ago |
|
Luke Dashjr
|
0379b56aaa
Merge commit '7f46f6e' into cg_merges_20121231
|
13 years ago |
|
Luke Dashjr
|
a70cb64c7b
Merge commit 'e1d7ecd' into cg_merges_20121231
|
13 years ago |
|
Luke Dashjr
|
27b385b781
Fix more printf-format non-compatibilities
|
13 years ago |
|
Luke Dashjr
|
ae96559e15
Merge branch 'bugfix_format' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
c43935908b
Fix more printf-format non-compatibilities
|
13 years ago |
|
Luke Dashjr
|
149e8037c1
Reset all stats when requested
|
13 years ago |
|
Luke Dashjr
|
9153c71be3
Merge branch 'cg_merges_20121226' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
238aff5d6b
Merge branch 'cgminer' into cg_merges_20121226
|
13 years ago |
|
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
|
d654c8467d
Merge commit '945b7e1' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
945b7e1f29
Bugfix: Ensure nonces are put in data as little-endian in test_nonce*
|
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 |
