Merge remote-tracking branch 'upstream/master' into iclass

author marshmellow42 <marshmellowrf@gmail.com>

Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)

committer marshmellow42 <marshmellowrf@gmail.com>

Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
author marshmellow42 <marshmellowrf@gmail.com>
Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
committer marshmellow42 <marshmellowrf@gmail.com>
Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
diff --cc armsrc/appmain.c
Simple merge
diff --cc armsrc/apps.h
Simple merge
diff --cc client/cmdlf.c
Simple merge
diff --cc client/hid-flasher/usb_cmd.h
Simple merge
diff --cc client/lualibs/commands.lua
Simple merge
diff --cc include/usb_cmd.h
Simple merge
author	marshmellow42 <marshmellowrf@gmail.com>
	Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
committer	marshmellow42 <marshmellowrf@gmail.com>
	Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
		1	2
armsrc/appmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	patch \|	diff1 \|	diff2 \|	blob \| history
client/cmdlf.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/hid-flasher/usb_cmd.h	patch \|	diff1 \|	diff2 \|	blob \| history
client/lualibs/commands.lua	patch \|	diff1 \|	diff2 \|	blob \| history
include/usb_cmd.h	patch \|	diff1 \|	diff2 \|	blob \| history