dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,800 Commits 7 Branches 1 Tag
855aee04ddf7e0898beeebbfa5fa88b68d566cb9
Commit Graph

54 Commits

Author SHA1 Message Date
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
iceman1001
3d93d4f940 Add: simple Application enum. 
Fix:  Minor overflows found by Holiman.
 2014-09-18 14:15:48 +02:00
iceman1001
313ee67ea2 Fixed: "hf mfdes info" 2014-09-18 12:38:31 +02:00
iceman1001
f38a152863 First check in. 2014-09-11 23:23:46 +02:00