projects / fw / stlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7abc08e 27cbec5)
Merge branch 'master' of https://github.com/texane/stlink
authorKarl Palsson <karlp@tweak.net.au>
Sun, 16 Oct 2011 20:54:06 +0000 (20:54 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Sun, 16 Oct 2011 20:54:06 +0000 (20:54 +0000)
Conflicts:
src/stlink-usb.c

1  2 
src/stlink-usb.c patch | diff1 | diff2 | blob | history

diff --cc src/stlink-usb.c
Simple merge
STM tools with support for Altus Metrum targets