From: iceman1001 <iceman@iuse.se>
Date: Wed, 1 Apr 2015 16:02:10 +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/49dc1d0a9eafdb1e369ead88c3c8882bc6959a17?hp=49dc1d0a9eafdb1e369ead88c3c8882bc6959a17

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

Conflicts:
	armsrc/Makefile
	armsrc/lfops.c
	client/cmdlft55xx.c
	common/ldscript.common
	common/lfdemod.c
---