Merge pull request #121 from frederikmoellers/master

author Martin Holst Swende <martin@swende.se>

Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)

committer Martin Holst Swende <martin@swende.se>

Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)
author Martin Holst Swende <martin@swende.se>
Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)
committer Martin Holst Swende <martin@swende.se>
Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)
diff --cc armsrc/appmain.c
Simple merge
diff --cc armsrc/apps.h
Simple merge
diff --cc include/usb_cmd.h
Simple merge
author	Martin Holst Swende <martin@swende.se>
	Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)
committer	Martin Holst Swende <martin@swende.se>
	Tue, 23 Jun 2015 20:23:08 +0000 (22:23 +0200)
		1	2
armsrc/appmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/usb_cmd.h	patch \|	diff1 \|	diff2 \|	blob \| history