Luke Dashjr
|
e9ca4203a2
Merge commit 'e51ee93' into cg_merges_20121210
|
13 years ago |
Con Kolivas
|
e51ee93182
Set tv_idle time if a pool is not active when input from the menu.
|
13 years ago |
Luke Dashjr
|
4e7acd32f0
Null-Merge commit '7d14572' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
65e0d2ddbd
Merge commit 'b4908ed' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
89ee6c0773
Merge commit '70b6287' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
da6e740af6
Tree-Merge commit 'c3fb1bc' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
7f1fc0ce93
Merge commit '69494c1' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
b054e59119
Merge commit '1922e49' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
65f4b488d5
Null-Merge commit 'c70a265' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
cade98b1da
Merge commit '0c41b1b' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
3dbf3b0c9a
Merge commit '2b5467c' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
7f8359621c
Merge commit 'c5d9f3a' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
192e7a5f17
Merge commit '43be78c' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
215c6802cf
Merge commit '40f5362' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
971e7a27ee
Merge commit '031ba75' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
1f020d34e5
Merge commit '383b42f' into cg_merges_20121210
|
13 years ago |
Luke Dashjr
|
228151f3c0
Null-Merge commit '8feb302' into cg_merges_20121210
|
13 years ago |
Con Kolivas
|
7d14572973
Merge pull request #355 from denis2342/ztex
|
13 years ago |
Con Kolivas
|
b4908edd96
Merge pull request #356 from kanoi/api
|
13 years ago |
Kano
|
440edfc49f
usb display message when device is in use/another cgminer
|
13 years ago |
Denis Ahrens
|
e2c8a1d0f6
libztex: avoid the use of libusb_error_name()
|
13 years ago |
Con Kolivas
|
70b6287627
Merge pull request #354 from kanoi/api
|
13 years ago |
Kano
|
58a7226d96
minor unlikely zero pointer test
|
13 years ago |
Con Kolivas
|
c3fb1bcef5
Revert "Selectively discard all work items if a longpoll or stratum restart is received without a new block to work on."
|
13 years ago |
Con Kolivas
|
69494c12ed
BeaverCreek doesn't like BFI INT patching.
|
13 years ago |
Luke Dashjr
|
a4110aed1d
Merge branch 'submit_async2' into bfgminer
|
13 years ago |
Luke Dashjr
|
df505a2f12
Suppress warning about "succeeded" not being used in finish_req_in_progress for now
|
13 years ago |
Luke Dashjr
|
25ccb5e2ea
Bugfix: Always give the get_work thread a curl, regardless of other outstanding curls in use
|
13 years ago |
Luke Dashjr
|
43ff9fbe9c
Bugfix: Failover after even a single job-request failure (or else it takes too long on timeouts)
|
13 years ago |
Luke Dashjr
|
88afbe9c26
Bugfix: Need to remove and re-add curl easy handles from multi to start a new request
|
13 years ago |