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

Conflicts: client/util.c
2015-02-14 12:30:08 +01:00
parent 68008fb517 2e2fc9fa6b
commit 6af88242eb
2 changed files with 0 additions and 2 deletions
--- 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':