From: marshmellow42 <marshmellowrf@gmail.com>
Date: Mon, 15 Feb 2016 19:13:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master' into pm3+reveng
X-Git-Tag: v3.0.0~76^2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/7f0d5926362d50ed01ea04af95a1e03777fce47c

Merge remote-tracking branch 'upstream/master' into pm3+reveng
---

7f0d5926362d50ed01ea04af95a1e03777fce47c
diff --cc client/Makefile
index ea532099,0972f441..5b604b11
--- a/client/Makefile
+++ b/client/Makefile
@@@ -84,7 -84,8 +84,8 @@@ CMDSRCS = 	nonce2key/crapto1.c
  			cmdhflegic.c \
  			cmdhficlass.c \
  			cmdhfmf.c \
 -            cmdhfmfu.c \
 +			cmdhfmfu.c \
+ 			cmdhftopaz.c \
  			cmdhw.c \
  			cmdlf.c \
  			cmdlfio.c \
diff --cc client/cmdmain.c
index d994f2e5,c1d730ee..843f9301
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@@ -68,16 -65,8 +68,15 @@@ int CmdHelp(const char *Cmd
  
  int CmdQuit(const char *Cmd)
  {
-   exit(0);
-   return 0;
+   return 99;
  }
 +
 +int CmdRev(const char *Cmd)
 +{
 +  CmdCrc(Cmd);
 +  return 0;
 +}
 +
  /**
   * @brief This method should be called when sending a new command to the pm3. In case any old
   *  responses from previous commands are stored in the buffer, a call to this method should clear them.