]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 24 Mar 2015 10:45:31 +0000 (11:45 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 24 Mar 2015 10:45:31 +0000 (11:45 +0100)
commit0ec548dc2122f9bc0f0b536db5fa1a12f1f5c16a
tree0fc98e3cc7a2976a2494bb54d9d2b44224806925
parent754a35e72bfe75868d7a824692fe980feedffb82
parent90a8b82fb4ffc8f25038bb3ed10082cf913d50bb
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/lfops.c
client/cmddata.c
client/cmdlf.c
client/cmdlft55xx.c
client/cmdlft55xx.h
client/scripts/test_t55x7_bi.lua
22 files changed:
armsrc/BigBuf.c
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifaredesfire.c
client/Makefile
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhfmfdes.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdlf.c
client/scripts/test_t55x7_bi.lua
common/Makefile.common
common/lfdemod.c
common/protocols.h
include/mifare.h
Impressum, Datenschutz