RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-14 05:41:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
1108 commits 3 branches 14 tags 87 MiB
Commit graph

2 commits

Author SHA1 Message Date
Martin Holst Swende
d60418a05f Synchronized loclass library, imported the legal warning 2015-01-15 16:30:05 +01: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