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

..

cipher.c

First check in.

2014-09-11 23:23:46 +02:00

cipher.h

First check in.

2014-09-11 23:23:46 +02:00

cipherutils.c

First check in.

2014-09-11 23:23:46 +02:00

cipherutils.h

First check in.

2014-09-11 23:23:46 +02:00

des.c

First check in.

2014-09-11 23:23:46 +02:00

des.h

First check in.

2014-09-11 23:23:46 +02:00

elite_crack.c

First check in.

2014-09-11 23:23:46 +02:00

elite_crack.h

First check in.

2014-09-11 23:23:46 +02:00

fileutils.c

Fixed: "hf mfdes info"

2014-09-18 12:38:31 +02:00

fileutils.h

First check in.

2014-09-11 23:23:46 +02:00

ikeys.c

First check in.

2014-09-11 23:23:46 +02:00

ikeys.h

First check in.

2014-09-11 23:23:46 +02:00

main.c

First check in.

2014-09-11 23:23:46 +02:00