 Luke Dashjr
|
6cefefb52c
Merge commit 'bb964b4' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
3dc6ea620c
Semi-Merge commit 'c1ff90a' into cg_merges_20130524b (only change symbol signatures)
|
12 years ago |
|
Luke Dashjr
|
1b027079bb
Merge commit '6b714dd' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
635d9327a7
Merge commit 'a6250fb' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
86e3a8cb9c
Merge commit 'b4bc5e2' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
bfce744fe0
Merge commit '67ebf45' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
7d77099eb2
Merge commit '8d22ca1' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
0dccf5cfd4
Merge commit '3209c11' into cg_merges_20130524b
|
12 years ago |
|
Luke Dashjr
|
fec4e9003b
Merge commit '51fbcfe' into cg_mrges_20130524b
|
12 years ago |
|
Luke Dashjr
|
2e763c7592
Merge commit 'b948669' into cg_mrges_20130524b
|
12 years ago |
|
Luke Dashjr
|
42f6915b27
Merge commit '29f0ac7' into cg_mrges_20130524b
|
12 years ago |
|
Luke Dashjr
|
b9360881b5
Merge commit '6400088' into update_avalon_20130524
|
12 years ago |
|
Luke Dashjr
|
bdca79b7e3
Merge commit '5c7a32f' into update_avalon_20130524
|
12 years ago |
|
Luke Dashjr
|
2bf4333a6f
Merge commit 'e9b6ff8' into update_avalon_20130524
|
12 years ago |
|
Luke Dashjr
|
db7dcd6e64
Merge commit '97bad1e' into update_avalon_20130524
|
12 years ago |
|
Luke Dashjr
|
d371272609
Semi-Merge commit '1802302' into update_avalon_20130524 (sync with cgminer rebase)
|
12 years ago |
|
Luke Dashjr
|
826259b98b
Semi-Merge commit 'e9a65bb' into cg_merges_20130523a (move/rewrite comment only)
|
12 years ago |
|
Luke Dashjr
|
19294f1238
Merge branch 'winpthread' into cg_merges_20130523a
|
12 years ago |
|
Luke Dashjr
|
9fb8b34e4e
Use has_pth flag instead of trying to mess with pthread internals
|
12 years ago |
|
Luke Dashjr
|
489d70498e
Partial-Merge commit '6c418f4' into cg_merges_20130523a:
|
12 years ago |
|
Luke Dashjr
|
4a2192cba5
Null-Merge commit '1a19729' into cg_merges_20130523a
|
12 years ago |
|
Luke Dashjr
|
70d3e792e0
Merge commit '2883b56' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
2883b56790
Bugfix: Restore always autodetecting stratum as non-scrypt
|
12 years ago |
|
Luke Dashjr
|
904b4f53d4
Merge commit 'c4105a6' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
c4105a63d1
Increase fd limits as much as possible at startup
|
12 years ago |
|
Luke Dashjr
|
09ae54ecc7
Merge branch 'cg_merges_20130513' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
527b6ffdc6
Merge commit '21a36f4' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
d4bacef58c
Merge commit 'b6e3d5b' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
8dabfeb856
Merge commit 'b8ed231' into cg_merges_20130513
|
12 years ago |
|
Luke Dashjr
|
613ecb407e
Merge commit '26ddd1f' into cg_merges_20130513
|
12 years ago |
