merlokk ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad ... # Conflicts: # client/cmdhfmf.c # client/mifare/mifarehost.c		2019-03-01 19:37:43 +02:00
..
mad.c
mad.h
mfkey.c
mfkey.h
mifare4.c
mifare4.h
mifaredefault.h
mifarehost.c
mifarehost.h