From: Iceman <iceman@iuse.se>
Date: Sun, 26 Mar 2017 12:35:42 +0000 (+0200)
Subject: Merge pull request #251 from marshmellow42/master
X-Git-Tag: v3.0.0~31
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d95878f8022707b9e66e7ec7c22403459371d7d4?hp=-c

Merge pull request #251 from marshmellow42/master

split fdx-b demod to its own file
---

d95878f8022707b9e66e7ec7c22403459371d7d4
diff --combined client/Makefile
index 36d0c994,4bac1ac9..d5bfb086
--- 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 \
@@@ -67,7 -67,6 +67,7 @@@
  			loclass/fileutils.c\
  			whereami.c\
  			mifarehost.c\
 +			parity.c\
  			crc.c \
  			crc16.c \
  			crc64.c \
@@@ -93,6 -92,7 +93,7 @@@
  			cmdlfawid.c \
  			cmdlfcotag.c\
  			cmdlfem4x.c \
+ 			cmdlffdx.c \
  			cmdlfgproxii.c \
  			cmdlfhid.c \
  			cmdlfhitag.c \