From: iceman1001 <iceman@iuse.se>
Date: Sat, 14 Feb 2015 11:30:08 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/6af88242eb458bad91c77b424b03bf19ecce5da1?hp=68008fb517179131a7368a0917150867f14decd1

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

Conflicts:
	client/util.c
---

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 8dd944cb..849b96ef 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -414,7 +414,6 @@ int CmdLFSetConfig(const char *Cmd)
 	uint8_t cmdp =0;
 	while(param_getchar(Cmd, cmdp) != 0x00)
 	{
-		PrintAndLog("working %c", param_getchar(Cmd, cmdp));
 		switch(param_getchar(Cmd, cmdp))
 		{
 		case 'h':
diff --git a/client/util.c b/client/util.c
index c55d3f66..edd9aebc 100644
--- a/client/util.c
+++ b/client/util.c
@@ -237,7 +237,6 @@ uint8_t param_get8(const char *line, int paramnum)
 uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
 {
 	uint8_t val =  param_get8ex(line, paramnum, 255, 10);
-	printf("read %i\n", (int8_t ) val);
 	if( (int8_t) val == -1) return 1;
 	(*destination) = val;
 	return 0;