dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-04 07:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
828 Commits 3 Branches 20 Tags
e47e52a2c8f2d925cefe2f5f1a55ceceb7ca0813
Commit Graph

3 Commits

Author SHA1 Message Date
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