From: iceman1001 <iceman@iuse.se>
Date: Mon, 25 May 2015 11:13:06 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c068ebb78f2e4070fcf1a604df0d7088374b60c6

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	armsrc/mifarecmd.c
	client/cmdhfmf.c
---

c068ebb78f2e4070fcf1a604df0d7088374b60c6
diff --cc armsrc/mifarecmd.c
index 9c17ce3c,8355cd19..ff9fb16a
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@@ -332,11 -335,9 +332,11 @@@ void MifareUReadCard(uint8_t arg0, uint
  	if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);
  
  	countblocks *= 4;
- 	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(),0 , 0);
+ 	cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);
  	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
  	LEDsoff();
 +	
 +	BigBuf_free();
  }
  
  //-----------------------------------------------------------------------------
diff --cc client/cmdhfmf.c
index 94c47072,2b5a5b87..eb2479ff
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -1326,8 -1311,8 +1326,9 @@@ int CmdHF14AMfESave(const char *Cmd
  		}
  		else {
  			for (j = 0; j < 7; j++, fnameptr += 2)
- 				sprintf(fnameptr, "%02X", buf[j]); 
+ 				sprintf(fnameptr, "%02X", buf[j]);
+ 		}
 +		}
  	} else {
  		fnameptr += len;
  	}