Luke Dashjr
|
d5e6b946bc
Merge commit '5ce372e' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
083d663072
Merge commit 'b4eb870' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
1979708222
Merge commit '4153d90' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
0fbbab10b6
Merge commit '2bfd8e2' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
f3a8db17ed
Null-Merge commit '5bd1b56' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
992352478b
Merge commit '50c8377' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
a774c070e4
Merge commit 'a39a38e' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
c461c283fe
Null-Merge commit 'a821df6' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
29277b3bad
Null-Merge commit '1e35965' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
f3d7d77900
Merge commit 'a95dfb1' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
c8e4822258
Null-Merge commit '3ffc3f1' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
e9d47e748d
Merge commit '448f8dd' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
dcad3c85e1
Merge commit '251b71b' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
2180b8e1e3
Null-Merge commit '81dfe60' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
cf67b2c081
Merge commit '9fa8e92' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
073baa1988
Merge commit '05478b5' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
0226ffc293
Merge commit 'd2719e3' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
5b6dde5488
Null-Merge commit '269a145' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
ee1371ffb4
Null-Merge commit '563cad1' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
5122dfa489
Merge commit '680f014' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
26ec9b2839
Null-Merge commit 'dfa849a' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
365cd66cde
Add cgminer compatibility macro for ms_tdiff
|
12 years ago |
Luke Dashjr
|
90d6e862bf
Merge commit 'b1fc68b' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
5a0a6888c7
Merge commit 'c9adb19' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
30a5bfb592
Null-Merge commit '789d448' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
df126663cd
Merge commit '011f2d3' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
66bf6c9911
Null-Merge commit 'ad8d949' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
db2588741b
Null-Merge commit 'c04f3bf' into cg_merges_20131108a (cgminer null-merged this)
|
12 years ago |
Luke Dashjr
|
235b2bcefa
Null-Merge commit '514b3c4' into cg_merges_20131108a
|
12 years ago |
Luke Dashjr
|
71237664a6
Null-Merge commit 'addb848' into cg_merges_20131108a
|
12 years ago |