projects / fw / stlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ed7464f)
Merge branch 'master' into killsg
authorKarl Palsson <karlp@tweak.net.au>
Thu, 3 Nov 2011 00:46:58 +0000 (00:46 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Thu, 3 Nov 2011 00:47:28 +0000 (00:47 +0000)
Conflicts:
src/stlink-common.c
src/test_sg.c

Conflicts were only in changes to logging.


No differences found
STM tools with support for Altus Metrum targets