]> git.zerfleddert.de Git - proxmark3-svn/commit - armsrc/iso14443a.c
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 10 Mar 2015 08:18:35 +0000 (09:18 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 10 Mar 2015 08:18:35 +0000 (09:18 +0100)
commit12d708fec157dfde6f94d61e5fdc265713a71578
tree75404d47e44b3c467bd186dbbadb826c92520259
parent652c39c63bce093cec80b174dfb0d8154e7c6827
parent58e93ff593ee67e1c41fa790110dc60f09b91cc4
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmddata.c
client/cmddata.h
armsrc/appmain.c
armsrc/apps.h
armsrc/iso14443a.c
armsrc/lfops.c
client/cmddata.c
client/cmddata.h
client/cmdlf.c
client/lualibs/commands.lua
include/usb_cmd.h
Impressum, Datenschutz