]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into Pentu...
authorMartin Holst Swende <martin@swende.se>
Sat, 28 Jun 2014 18:52:37 +0000 (20:52 +0200)
committerMartin Holst Swende <martin@swende.se>
Sat, 28 Jun 2014 18:52:37 +0000 (20:52 +0200)
commit3ad48540d4d77f50cc62d16acb78f17019ef431d
tree5cf592034972108a3fd8b16b7f4508ac1a30f9e6
parent6c0f60ca7bcd7737b5d3867004f1cbdc9532720c
parentfecd8202a5ad638db4c1ba088842390e78ef52db
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
19 files changed:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
client/Makefile
client/cmdhficlass.c
client/loclass/cipher.c
client/loclass/cipher.h
client/loclass/cipherutils.c
client/loclass/cipherutils.h
client/loclass/elite_crack.c
client/loclass/elite_crack.h
client/loclass/fileutils.c
client/loclass/fileutils.h
client/loclass/ikeys.c
client/loclass/ikeys.h
client/loclass/main.c
client/obj/loclass/.dummy
include/usb_cmd.h
Impressum, Datenschutz