git.zerfleddert.de Git - proxmark3-svn/commitdiff

]> git.zerfleddert.de Git - proxmark3-svn/commitdiff

author	marshmellow42 <marshmellowrf@gmail.com>
	Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)
committer	marshmellow42 <marshmellowrf@gmail.com>
	Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)

Conflicts:
client/cmdlf.c

		1	2
client/cmddata.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

Proxmark3 GIT tracking