 Luke Dashjr
|
bdca79b7e3
Merge commit '5c7a32f' into update_avalon_20130524
|
13 years ago |
|
Luke Dashjr
|
2bf4333a6f
Merge commit 'e9b6ff8' into update_avalon_20130524
|
13 years ago |
|
Luke Dashjr
|
db7dcd6e64
Merge commit '97bad1e' into update_avalon_20130524
|
13 years ago |
|
Luke Dashjr
|
d371272609
Semi-Merge commit '1802302' into update_avalon_20130524 (sync with cgminer rebase)
|
13 years ago |
|
Luke Dashjr
|
826259b98b
Semi-Merge commit 'e9a65bb' into cg_merges_20130523a (move/rewrite comment only)
|
13 years ago |
|
Luke Dashjr
|
19294f1238
Merge branch 'winpthread' into cg_merges_20130523a
|
13 years ago |
|
Luke Dashjr
|
9fb8b34e4e
Use has_pth flag instead of trying to mess with pthread internals
|
13 years ago |
|
Luke Dashjr
|
489d70498e
Partial-Merge commit '6c418f4' into cg_merges_20130523a:
|
13 years ago |
|
Luke Dashjr
|
4a2192cba5
Null-Merge commit '1a19729' into cg_merges_20130523a
|
13 years ago |
|
Luke Dashjr
|
70d3e792e0
Merge commit '2883b56' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
2883b56790
Bugfix: Restore always autodetecting stratum as non-scrypt
|
13 years ago |
|
Luke Dashjr
|
904b4f53d4
Merge commit 'c4105a6' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
c4105a63d1
Increase fd limits as much as possible at startup
|
13 years ago |
|
Luke Dashjr
|
09ae54ecc7
Merge branch 'cg_merges_20130513' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
527b6ffdc6
Merge commit '21a36f4' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
d4bacef58c
Merge commit 'b6e3d5b' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
8dabfeb856
Merge commit 'b8ed231' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
613ecb407e
Merge commit '26ddd1f' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
47f757ff2d
Merge commit 'fd87825' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
c6e1bc6053
Merge commit '0bbaaa9' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
51f8effca9
Merge commit '74164a3' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
3ea2ce3f28
Merge commit 'e0196a3' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
7b80eae2d9
Merge commit '81c0212' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
ba459292ee
Merge commit '3b84131' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
b5df3ae7cc
Merge commit '9b34d82' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
3b6a7d9cdb
Merge commit '3db4d6f' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
dd756f293e
Merge commit '81567e5' into cg_merges_20130513
|
13 years ago |
|
Luke Dashjr
|
2087ed5a67
Merge commit '456bd96' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
456bd96a4a
Bugfix: Missing 'else' can result in null pointer dereference in race
|
13 years ago |
|
Luke Dashjr
|
84907ce0ee
Merge commit '016f065' into cg_merges_20130513
|
13 years ago |
