 Luke Dashjr
|
1d9e6d2bb3
Merge commit '8ed381f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d964c86f98
Revert "Merge commit '5e2c132' into bfgminer" (miner.php Diff1/WU)
|
13 years ago |
|
Luke Dashjr
|
250acb840c
Merge commit '5e2c132' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
16c9e48e1f
Tree-Merge commit 'af32fb9' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
2d6259c290
Merge commit 'b3cfe47' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
e8984067da
Merge commit 'e5ed708' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
f3b4e3d7a3
Merge commit '08948e0' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7a0fab9508
Merge commit 'c01284f' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
2445f4f4d9
Tree-Merge commit '272ba4e' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
a5545e78fc
Merge commit '8fc701d' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
864a1267fa
Merge commit 'afb99b6' into bfgminer
|
13 years ago |
 ckolivas
|
afb99b674b
Free work before retrying in get_work_thread.
|
13 years ago |
|
Luke Dashjr
|
f04174c897
Merge commit '35cb7fd' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
7ba366b15e
Tree-Merge commit '69d8c33' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
1141f97a27
Merge commit 'b622e97' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
d286074379
Merge commit 'a9278ce' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
6a4ce68cb3
Merge commit '34b8dcb' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
22da046d71
Restore --retries feature for submissions only, where it makes sense.
|
13 years ago |
|
Luke Dashjr
|
41d1bdc851
Merge commit '1f295cd' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
4b2bbeebb3
Merge commit '527df8b' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
f7a4e34b2a
Tree-Merge commit '933627e' into bfgminer
|
13 years ago |
|
Con Kolivas
|
8ed381f78a
Only set lagging flag once there are no staged work items.
|
13 years ago |
|
Con Kolivas
|
f5ac84b804
select_pool does not switch back to the primary once lagging is disabled.
|
13 years ago |
|
Con Kolivas
|
5e2c1323a9
Merge pull request #300 from kanoi/api
|
13 years ago |
|
Con Kolivas
|
af32fb9a3d
Merge pull request #301 from kanoi/minerphp
|
13 years ago |
|
ckolivas
|
f71d635f0f
Free work before retrying in get_work_thread.
|
13 years ago |
|
Con Kolivas
|
3b234da43f
Merge pull request #302 from luke-jr/bugfix_ftdi_alloca
|
13 years ago |
|
Luke Dashjr
|
c4c4517944
Bump version to 2.7.0
|
13 years ago |
|
Luke Dashjr
|
877be483c4
Merge branch 'bfgminer-2.6.x' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3cb49fdf2a
Bump version to 2.6.5
|
13 years ago |
