Merge branch 'master' of https://github.com/texane/stlink
authorKarl Palsson <karlp@tweak.net.au>
Sun, 16 Oct 2011 20:54:06 +0000 (20:54 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Sun, 16 Oct 2011 20:54:06 +0000 (20:54 +0000)
commit46f1a7f29a6570165d61d90ae3fe36f3bf5ef455
treeae36c4aaeaff1163bdd00cd64c741ca67cad112b
parent7abc08eeefdd4128ca55bcece97eda9c54a9e5bb
parent27cbec5d271d7479ec1a54a05c901c1fd01c1041
Merge branch 'master' of https://github.com/texane/stlink

Conflicts:
src/stlink-usb.c
src/stlink-usb.c