 Luke Dashjr
|
dbd57a40e0
Tree-Merge commit '3c91b29' into cg_merges_20130512b
|
13 years ago |
|
Luke Dashjr
|
28423a373d
Merge branch 'hotplug' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
f104b3e904
Merge commit 'd143c27' into hotplug
|
13 years ago |
|
Luke Dashjr
|
a2878fdcd6
Merge commit '7520194' into hotplug
|
13 years ago |
|
Luke Dashjr
|
7846ebbffa
Merge commit '50520cc'/'5d122ca' into hotplug
|
13 years ago |
|
Luke Dashjr
|
0605d6c5c7
Null-Merge commit '08ece33' into hotplug
|
13 years ago |
|
Luke Dashjr
|
79b3d3c3f1
Merge commit '64da19f'/'61ec1fe' into hotplug
|
13 years ago |
|
Luke Dashjr
|
8c6e1229a1
Merge commit 'd9e2a04'/'212f32e' into hotplug
|
13 years ago |
|
Luke Dashjr
|
662877228d
Merge branch 'cg_updates_20130512' into bfgminer (no changes: all tree/null)
|
13 years ago |
|
Luke Dashjr
|
507e8e1d34
Null-Merge commit '8fbc4da' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
807775928d
Tree-Merge commit '7388942' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
1e68e26bda
Null-Merge commit '05157e0' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
7e8f285323
Tree-Merge commit '383a21b' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
7225d43140
Null-Merge commit '9447610' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
b57eb1e053
Tree-Merge commit 'a52522a' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
a46c72c467
Null-Merge commit 'ea807cf' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
3c5bdb1aa2
Tree-Merge commit '24525ed' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
9af21f8510
Null-Merge commit '34bcc1c' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
b848d14f14
Tree-Merge commit '4f460ca' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
57c6f4acab
Null-Merge commit 'f53549a' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
67ac010e96
Tree-Merge commit '0b3d8c8' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
911f0b6ce8
Null-Merge commit 'bad942e' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
96cbfb75ce
Tree-Merge commit '7724989' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
9b4bec1898
Null-Merge commit '44ec755' into cg_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
5bf0a862ef
Tree-Merge commit '580607c' into bfgminer
|
13 years ago |
|
Luke Dashjr
|
3974e1d8bd
Merge branch 'hashmeter_updates_20130512' into bfgminer
|
13 years ago |
 Con Kolivas
|
ba54b7451b
Update the hashmeter at most 5 times per second.
|
13 years ago |
|
Luke Dashjr
|
10b2cd6c61
Merge commit 'd9d5a1a' into hashmeter_updates_20130512
|
13 years ago |
|
Luke Dashjr
|
ef71e3c2a5
Merge commit '31a47fc' into bfgminer
|
13 years ago |
 navyxliu
|
31a47fce24
Fix the problem of seting up termio of ttyUSB0 for icarus. the CSIZE is the mask of CS2/4/8
|
13 years ago |
