 Luke Dashjr
|
4600ab1eb3
Merge commit '8ede407' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
17369bf328
Null-Merge commit '4306aa7' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
46a22e96a2
Merge commit '52496f9' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
53c427c8ee
Null-Merge commit 'c060ea5' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
a4d822321e
Merge commit 'b445f9c' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
bcaa3386de
Merge commit '9f27831' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
1ff7023e5e
Merge commit '4185b7d' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
2578fa9027
Merge commit 'b90e059' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
d1c02f6ed5
Merge commit '70c0c33' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
958594e142
Merge commit '5bf9856' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
037e1c3e24
Null-Merge tag 'v3.4.1' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
3005257dba
Merge commit '51b0701' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
3c57c775bb
Null-Merge commit 'a7f64b8' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
668f3e01c0
Merge commit '1d5d28d' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
7cbd8a8328
Merge commit '22ca87d' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
9b9d26375a
Null-Merge commit '33ae5ab' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
d7c9c95bc7
Merge commit '0d4edbe' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
9d65809d52
Null-Merge commit 'bec40c5' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
375b197bb3
Merge commit '572df10' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
467a2ddc17
Null-Merge commit 'dd64f73' into cg_merges_20131023a
|
12 years ago |
|
Luke Dashjr
|
f34678f301
Add --set-device option to allow setting default procset commands
|
12 years ago |
 kanoi
|
3c2647d4b5
Merge pull request #511 from kanoi/master
|
12 years ago |
|
Luke Dashjr
|
2251fee113
Merge commit 'cfe6795' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
cfe679535d
Wait until all pools are done testing before giving up, regardless of how long they take to fail
|
12 years ago |
 Kano
|
8437805f5c
klondike - error condition handling
|
12 years ago |
 Con Kolivas
|
5ea6a8eaa2
Merge branch 'master' into hashfast
|
12 years ago |
|
Con Kolivas
|
4f7b6fe4c3
Avoid entering static libusb directory if --with-system-libusb is enabled.
|
12 years ago |
|
Con Kolivas
|
e76421320e
Minor opencl build corrections.
|
12 years ago |
|
Con Kolivas
|
ed16f32d8f
Enable dynamic linking against system libusb --with-system-libusb
|
12 years ago |
|
Con Kolivas
|
9fa8e920c7
Modify Makefile to only include opencl related code when configured in.
|
12 years ago |
