 Luke Dashjr
|
d1c5ea252e
Merge commit 'd2ceb17' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
d2ceb17260
s/cg/BFG/
|
12 years ago |
|
Luke Dashjr
|
2087ed5a67
Merge commit '456bd96' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
456bd96a4a
Bugfix: Missing 'else' can result in null pointer dereference in race
|
12 years ago |
|
Luke Dashjr
|
2ca311f6ec
Merge branch 'update_old_avalon_20130513' into bfgminer
|
12 years ago |
|
Luke Dashjr
|
0f92c97099
Merge commit '6e9bbf2' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
6ea62f7fdc
Merge commit 'efa8d1f' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
4fa08c45e8
Merge commit '4820bde' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
3b4dcf7393
Null-Merge commit '4820bde^' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
c084d0985e
Merge commit '3c5ad8e' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
4522ee3c50
Merge commit '691b528' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
0423a77817
Merge commit '65bee71' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
1c6d32ab3a
Merge commit 'd013551' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
5eb0656649
Merge commit 'ba1ff87' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
b2452d6ee2
Merge commit 'fc65385' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
c462042b90
Merge commit '669fc38' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
4e8b005b5f
Null-Merge commit '669fc38^' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
dc2d6f6f92
Merge commit 'd37b314' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
95a15372a1
Merge commit '18f4d1a' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
abfe61e996
Null-Merge commit '18f4d1a^' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
1f0b032ab8
Merge commit '2821c14' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
590936b59b
Null-Merge commit '2821c14^' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
3860de6285
Merge commit '420329f' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
64b3dd8f8f
Null-Merge commit '420329f^' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
c4bdbca4fe
Merge commit '43dff4c' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
46bb5984df
Merge commit '5c1db2e' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
50b7de4fb6
Tree-Merge commit '5c1db2e^' into update_old_avalon_20130513
|
12 years ago |
|
Luke Dashjr
|
9ec5730db0
Merge branch 'cg_merges_20130512b' into bfgminer (no practical changes)
|
12 years ago |
|
Luke Dashjr
|
b819d9d7d3
Tree-Merge commit '649f293' into cg_merges_20130512b
|
12 years ago |
|
Luke Dashjr
|
be7ed3dd4d
Null-Merge commit 'e414cd0' into cg_merges_20130512b
|
12 years ago |
