Martin Holst Swende 3ad48540d4 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
2014-06-28 20:52:37 +02:00
..
2011-05-26 12:55:15 +00:00
2011-05-26 12:55:15 +00:00
2011-05-26 12:55:15 +00:00
2014-06-27 13:16:31 +02:00
2012-12-04 23:39:18 +00:00
2010-05-06 11:24:01 +00:00
2011-06-17 18:39:54 +00:00
2010-02-21 00:10:28 +00:00
2010-02-24 20:34:13 +00:00
2010-02-21 00:13:08 +00:00