dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad

Browse Source 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
This commit is contained in:
merlokk
2019-03-01 19:37:43 +02:00
parent 3a98c9fcd3 d73c501ffa
commit ee9daac029
63 changed files with 1216 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/Makefile
View File

@@ -188,6 +188,7 @@ CMDSRCS = crapto1/crapto1.c \
cmdlfio.c \
cmdlfindala.c \
cmdlfjablotron.c \
cmdlfkeri.c \
cmdlfnexwatch.c \
cmdlfnedap.c \
cmdlfnoralsy.c \