]> git.gag.com Git - fw/stlink/commitdiff
Merge branch 'master' of git://github.com/texane/stlink
authorUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Sat, 4 Feb 2012 14:44:40 +0000 (15:44 +0100)
committerUwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Sat, 4 Feb 2012 14:44:40 +0000 (15:44 +0100)
Conflicts:
src/stlink-common.c
Solved by propagating Karl's name change


No differences found