]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/iceman1001/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 16 Feb 2016 20:43:45 +0000 (21:43 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 16 Feb 2016 20:43:45 +0000 (21:43 +0100)
commit7504dc50d539f1f9b0b99064f5c7d38e373890fa
treeb4ed111291f60c05e0bec635da41f765b2d59dfc
parentee97a92adbf2009117c6c76e82bbdb57746355ae
parent3989d6fff6a686f2e7b3fa2242592ecf897d7ee4
Merge branch 'master' of https://github.com/iceman1001/proxmark3

Conflicts:
armsrc/crypto1.c
armsrc/iso14443a.c
armsrc/mifarecmd.c
tools/mfkey/Makefile
tools/nonce2key/Makefile
Impressum, Datenschutz