Commit graph

4 commits

Author SHA1 Message Date
iceman1001 96e41bfcec add: a .gitignore to be able to add the folder client/obj/reveng. 2015-06-14 23:32:20 +02:00
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
Merlokbr@gmail.com f89c705002 improved version of "hf 14a mifare" command
with merge with utility nonce2key
2011-05-31 11:31:20 +00:00
bushing cd00aa3043 merge linux and windows clients into one directory... will consolidate makefiles shortly 2009-12-22 12:11:15 +00:00