From: Karl Palsson <karlp@tweak.net.au>
Date: Sun, 16 Oct 2011 20:54:06 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/texane/stlink
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=46f1a7f29a6570165d61d90ae3fe36f3bf5ef455;p=fw%2Fstlink

Merge branch 'master' of https://github.com/texane/stlink

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

46f1a7f29a6570165d61d90ae3fe36f3bf5ef455