Commit graph

2 commits

Author SHA1 Message Date
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
merlokk 3b21b17509 move mifare stuff to its folder 2019-02-21 19:15:46 +02:00
Renamed from client/mifarehost.c (Browse further)