Merge branch 'master' into killsg
authorKarl Palsson <karlp@tweak.net.au>
Thu, 3 Nov 2011 00:46:58 +0000 (00:46 +0000)
committerKarl Palsson <karlp@tweak.net.au>
Thu, 3 Nov 2011 00:47:28 +0000 (00:47 +0000)
commited7464f235c889cbad6a953ee1ea64a99bf69304
tree60f4ccc0e5b9ce2215360e22358576956f8d7108
parentee772151c2aca1508b906982ad30944087e8143b
parent7de94e5491c2a5f0bba4e374c6aad6bdd61ee235
Merge branch 'master' into killsg

Conflicts:
src/stlink-common.c
src/test_sg.c

Conflicts were only in changes to logging.
src/stlink-common.c
src/stlink-common.h
src/stlink-sg.c
src/stlink-sg.h
src/test_sg.c