Luke Dashjr
|
a5ff98b2f5
Merge commit '9552f54' into cg_merges_20130818a
|
12 years ago |
Con Kolivas
|
e32feb9261
Yield after releasing a lock in case we are on a device with limited CPU resources.
|
12 years ago |
Luke Dashjr
|
373a2e83ff
Tree-Merge commit '3e84a19' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
51e3c13890
Null-Merge commit 'b423fe9' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
09c7f8b4d7
Null-Merge commit '48d91c7' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
33742d2a83
Merge commit '890c1c7' into cg_merges_20130818a
|
12 years ago |
Con Kolivas
|
890c1c79a7
Fix --scrypt being required before scrypt intensities on command line or not working at all via config files.
|
12 years ago |
Luke Dashjr
|
3cb5a28b3a
Merge commit '2b171f7' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
dd0cd7fe8c
Merge commit 'cb6d62d' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
f96097ba6b
Null-Merge commit 'd71e9f9' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
98c3667587
Merge commit '4b5f56e' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
036996eaeb
Null-Merge commit '8dc0935' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
8fba6a5ae4
Merge commit 'bda1e33' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
5800ca56d5
Tree-Merge commit 'dbac7f5' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
8d1696e01a
Null-Merge commit '1878029' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
aedafa66b7
Merge commit 'eb9278c' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
1355e9ebfb
Tree-Merge commit '837c731' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
8561e5b71e
Merge commit 'f2ae7fa' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
a45fa205cf
Null-Merge commit 'fa92ff8' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
5e1dde1b01
Merge commit 'a9e1098' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
edabd3ea19
Tree-Merge commit '5fb5dd0' into cg_merges_20130818a (already merged with miner.c)
|
12 years ago |
Luke Dashjr
|
3d9c4a3123
Null-Merge commit '51a928f' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
bd779a9775
Only use length-counted variants of format_unit and percentf
|
12 years ago |
Luke Dashjr
|
bd796b71ce
Implement snprintf-like versions of format_unit and percentf
|
12 years ago |
Luke Dashjr
|
0fbc481444
Merge commit '74d71cc' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
17eb22dfea
Merge commit 'ad1572f' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
5c4c4fa008
Merge commit '385a70b' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
464c526def
Null-Merge commit '805672f' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
87dc57fe77
Merge commit '42d96ee' into cg_merges_20130818a
|
12 years ago |
Luke Dashjr
|
9480246581
Null-Merge commit '18422fb' into cg_merges_20130818a
|
12 years ago |