]> cvs.zerfleddert.de Git - proxmark3-svn/commit
projects / proxmark3-svn / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c0f60c fecd820)
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
tree5cf592034972108a3fd8b16b7f4508ac1a30f9e6tree | snapshot
parent6c0f60ca7bcd7737b5d3867004f1cbdc9532720ccommit | diff
parentfecd8202a5ad638db4c1ba088842390e78ef52dbcommit | diff
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 diff1 | diff2 | blob | history
armsrc/appmain.c diff1 | diff2 | blob | history
armsrc/apps.h diff1 | diff2 | blob | history
armsrc/iclass.c diff1 | diff2 | blob | history
client/Makefile diff1 | diff2 | blob | history
client/cmdhficlass.c diff1 | diff2 | blob | history
client/loclass/cipher.c | diff2 | blob | history
client/loclass/cipher.h | diff2 | blob | history
client/loclass/cipherutils.c | diff2 | blob | history
client/loclass/cipherutils.h | diff2 | blob | history
client/loclass/elite_crack.c | | blob
client/loclass/elite_crack.h | | blob
client/loclass/fileutils.c | | blob
client/loclass/fileutils.h | | blob
client/loclass/ikeys.c | diff2 | blob | history
client/loclass/ikeys.h | diff2 | blob | history
client/loclass/main.c | | blob
client/obj/loclass/.dummy | | blob
include/usb_cmd.h diff1 | diff2 | blob | history
Proxmark3 GIT tracking
Impressum, Datenschutz