]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Sat, 23 May 2015 06:16:40 +0000 (08:16 +0200)
committericeman1001 <iceman@iuse.se>
Sat, 23 May 2015 06:16:40 +0000 (08:16 +0200)
commitbcf61bd34ab2747580aabf648093e5854b7283ed
treeb5fdafaef2d7541714fa3c7e23c23273d524b86a
parenta7e7cd419a820f5208c4920b4fd3ebd7222e5db3
parent86724c17c9914f495e2a7df729d4fe65a9746d82
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h
19 files changed:
README.txt
armsrc/appmain.c
armsrc/des.h
armsrc/iso14443a.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmdhf.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/lualibs/html_dumplib.lua
client/nonce2key/crapto1.c
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h
Impressum, Datenschutz