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)
commit7d9f4129abd300c9bb0cb3d9b86a5856cb2b3fb7
tree679b64a98a8c536801c561bad68a7d9507481aeb
parent5cd3ad39badef8f04b3380dfe2dfc82fc8b1b4ca
parente28a8f53a89d8c0aba07248ee4f281b70e5d0a2a
Merge branch 'master' of git://github.com/texane/stlink

Conflicts:
src/stlink-common.c
Solved by propagating Karl's name change
src/stlink-common.c