From: iceman1001 <iceman@iuse.se>
Date: Tue, 23 Jun 2015 21:02:29 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f53020e729d583f7975095ca7b4b467741d99edb?ds=sidebyside;hp=f53020e729d583f7975095ca7b4b467741d99edb

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

Conflicts:
	armsrc/Makefile
	armsrc/iso14443b.c
	armsrc/lfops.c
	client/cmdhf14b.c
	client/cmdhfmfu.c
	fpga/fpga_hf.bit
	fpga/hi_read_rx_xcorr.v
---