projects / fw / stlink / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1a949f 19b8c64)
Merge branch 'master' of github.com:UweBonnes/stlink
authorUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Tue, 31 Jan 2012 10:39:55 +0000 (11:39 +0100)
committerUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Tue, 31 Jan 2012 10:39:55 +0000 (11:39 +0100)
1  2 
flash/main.c patch | diff1 | diff2 | blob | history

diff --cc flash/main.c
Simple merge
STM tools with support for Altus Metrum targets