From: Iceman Date: Sat, 25 Mar 2017 06:28:53 +0000 (+0100) Subject: Merge pull request #245 from marshmellow42/master X-Git-Tag: v3.0.0~36 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/edf751bb62607c66684fd0750888d1fd6efd30e7?ds=sidebyside;hp=-c Merge pull request #245 from marshmellow42/master split lf indala[cmd] to lf indala [cmd] --- edf751bb62607c66684fd0750888d1fd6efd30e7 diff --combined client/Makefile index 1df870b5,511aaf2a..45490e4a --- a/client/Makefile +++ b/client/Makefile @@@ -58,7 -58,7 +58,7 @@@ CORESRCS = uart.c CMDSRCS = crapto1/crapto1.c\ crapto1/crypto1.c\ - nonce2key.c\ + mfkey.c\ loclass/cipher.c \ loclass/cipherutils.c \ loclass/des.c \ @@@ -95,6 -95,7 +95,7 @@@ cmdlfhid.c \ cmdlfhitag.c \ cmdlfio.c \ + cmdlfindala.c \ cmdlfpcf7931.c\ cmdlfpresco.c\ cmdlfpyramid.c\