projects / fw / stlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcf1030 081eae3)
Merge branch 'master' of git://github.com/texane/stlink
authorUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Wed, 18 Jan 2012 09:52:01 +0000 (10:52 +0100)
committerUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Wed, 18 Jan 2012 09:52:01 +0000 (10:52 +0100)
Conflicts:
gdbserver/Makefile


Trivial merge
STM tools with support for Altus Metrum targets