projects
/
fw
/
stlink
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
eae5157
8259385
)
Merge remote-tracking branch 'upstream/master' into travis-add-autotools-build
author
Jerry Jacobs
<jerry.jacobs@dualinventive.com>
Mon, 2 May 2016 15:11:56 +0000
(17:11 +0200)
committer
Jerry Jacobs
<jerry.jacobs@dualinventive.com>
Mon, 2 May 2016 15:11:56 +0000
(17:11 +0200)
* upstream/master:
st-info: --probe: Due to already claimed stlink one of them was zero. Fixes #401.
Trivial merge