From: iceman1001 <iceman@iuse.se>
Date: Mon, 16 Mar 2015 12:13:18 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/05446d5bc3d9263efc6a12026f6cf84bb421735e?hp=05446d5bc3d9263efc6a12026f6cf84bb421735e

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

Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	common/crc.c
	common/crc.h
	common/lfdemod.c
	include/crc.h
	include/crc.h.old
---