Merge pull request #1 from Proxmark/master

author marshmellow42 <marshmellow42@users.noreply.github.com>

Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)

committer marshmellow42 <marshmellow42@users.noreply.github.com>

Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
author marshmellow42 <marshmellow42@users.noreply.github.com>
Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
committer marshmellow42 <marshmellow42@users.noreply.github.com>
Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
diff --cc armsrc/appmain.c
Simple merge
diff --cc armsrc/apps.h
Simple merge
diff --cc client/cmddata.c
Simple merge
author	marshmellow42 <marshmellow42@users.noreply.github.com>
	Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
committer	marshmellow42 <marshmellow42@users.noreply.github.com>
	Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
		1	2
armsrc/appmain.c	patch \|	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	patch \|	diff1 \|	diff2 \|	blob \| history
client/cmddata.c	patch \|	diff1 \|	diff2 \|	blob \| history