From: iceman1001 <iceman@iuse.se>
Date: Mon, 30 Mar 2015 19:11:37 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/02d352fea75385d80b49a7ab8703692ae307f073?ds=sidebyside;hp=02d352fea75385d80b49a7ab8703692ae307f073

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h
---