iceman1001 75465377b9 Merge branch 'master' of https://github.com/Proxmark/proxmark3 ...

Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/iclass.c
	client/Makefile
	client/cmdhficlass.c
	client/loclass/cipher.c
	client/loclass/fileutils.c
	client/loclass/ikeys.h
	include/usb_cmd.h

2014-09-19 10:50:34 +02:00

4.4 KiB

Raw Blame History

View Raw