From: Iceman <iceman@iuse.se>
Date: Sun, 26 Mar 2017 06:26:30 +0000 (+0200)
Subject: Merge pull request #248 from marshmellow42/master
X-Git-Tag: v3.0.0~34
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fecfd86d3ddade989dd7bba8899c520e5a4faa95?ds=sidebyside;hp=-c

Merge pull request #248 from marshmellow42/master

Split data askgproxiidemod to own file
---

fecfd86d3ddade989dd7bba8899c520e5a4faa95
diff --combined client/Makefile
index 45490e4a,fa4690db..dfabc6da
--- 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 \
@@@ -92,6 -92,7 +92,7 @@@
  			cmdlfawid.c \
  			cmdlfcotag.c\
  			cmdlfem4x.c \
+ 			cmdlfgproxii.c \
  			cmdlfhid.c \
  			cmdlfhitag.c \
  			cmdlfio.c \