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 |
|