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

author Simon Wright <simon@pushface.org>

Fri, 23 Jan 2015 20:43:32 +0000 (20:43 +0000)

committer Simon Wright <simon@pushface.org>

Fri, 23 Jan 2015 20:43:32 +0000 (20:43 +0000)
author Simon Wright <simon@pushface.org>
Fri, 23 Jan 2015 20:43:32 +0000 (20:43 +0000)
committer Simon Wright <simon@pushface.org>
Fri, 23 Jan 2015 20:43:32 +0000 (20:43 +0000)
diff --cc gdbserver/gdb-server.c
Simple merge
diff --cc src/stlink-common.h
Simple merge
author	Simon Wright <simon@pushface.org>
	Fri, 23 Jan 2015 20:43:32 +0000 (20:43 +0000)
committer	Simon Wright <simon@pushface.org>
	Fri, 23 Jan 2015 20:43:32 +0000 (20:43 +0000)
		1	2
gdbserver/gdb-server.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/stlink-common.h	patch \|	diff1 \|	diff2 \|	blob \| history