 Luke Dashjr
|
479ae13b69
Revert "Merge commit '79dd9df' into cg_merges_20130524b"
|
13 years ago |
|
Luke Dashjr
|
728441358e
Revert "Semi-Merge commit '0b6ee62' into cg_merges_20130524b (just skip rehashing data in submission)"
|
13 years ago |
|
Luke Dashjr
|
79727cf800
Merge commit '2fb6637' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
a43e46d8f2
Semi-Merge commit '0b6ee62' into cg_merges_20130524b (just skip rehashing data in submission)
|
13 years ago |
|
Luke Dashjr
|
02ac49ccf4
Merge commit '79dd9df' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
7fa0c5e48d
Bugfix: Really fix device entries in saved config file
|
13 years ago |
|
Luke Dashjr
|
450919f5e0
Merge commit 'a923b7d' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
0aea6a4f92
Semi-Merge commit '6cef9f4' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
06cd56afc2
Semi-Merge commit '8b2118b' into cg_merges_20130524b (leave quit as printf-style)
|
13 years ago |
|
Luke Dashjr
|
b6f22fdb65
Merge commit '3d835fc' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
45a1703dfe
Semi-Merge commit '856aa49' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
de24336430
Merge commit 'f50ae46' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
6cefefb52c
Merge commit 'bb964b4' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
3dc6ea620c
Semi-Merge commit 'c1ff90a' into cg_merges_20130524b (only change symbol signatures)
|
13 years ago |
|
Luke Dashjr
|
1b027079bb
Merge commit '6b714dd' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
635d9327a7
Merge commit 'a6250fb' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
86e3a8cb9c
Merge commit 'b4bc5e2' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
bfce744fe0
Merge commit '67ebf45' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
7d77099eb2
Merge commit '8d22ca1' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
0dccf5cfd4
Merge commit '3209c11' into cg_merges_20130524b
|
13 years ago |
|
Luke Dashjr
|
fec4e9003b
Merge commit '51fbcfe' into cg_mrges_20130524b
|
13 years ago |
|
Luke Dashjr
|
2e763c7592
Merge commit 'b948669' into cg_mrges_20130524b
|
13 years ago |
|
Luke Dashjr
|
42f6915b27
Merge commit '29f0ac7' into cg_mrges_20130524b
|
13 years ago |
|
Luke Dashjr
|
b9360881b5
Merge commit '6400088' into update_avalon_20130524
|
13 years ago |
|
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 |
