From: Martin Holst Swende <martin@swende.se>
Date: Sat, 28 Jun 2014 18:52:37 +0000 (+0200)
Subject: Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into Pentu... 
X-Git-Tag: v2.0.0-rc1~88^2~7
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/3ad48540d4d77f50cc62d16acb78f17019ef431d?hp=3ad48540d4d77f50cc62d16acb78f17019ef431d

Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research

Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
---