From: iceman1001 Date: Fri, 6 Mar 2015 08:02:15 +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/3ac59c7fed24cc69e2c9f626e5e4392769779e13?hp=3ac59c7fed24cc69e2c9f626e5e4392769779e13 Merge branch 'master' of https://github.com/Proxmark/proxmark3 Conflicts: armsrc/crapto1.c armsrc/iclass.c client/nonce2key/crapto1.c ---