From: marshmellow42 Date: Sat, 23 Dec 2017 22:17:43 +0000 (-0500) Subject: Merge pull request #528 from Proxmark/iceman1001-patch-1 X-Git-Tag: v3.1.0~101 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/69fb283011ddb9aa0ba6d1234d36d3f4837ea0ab Merge pull request #528 from Proxmark/iceman1001-patch-1 Update cmdmain.c --- 69fb283011ddb9aa0ba6d1234d36d3f4837ea0ab