]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Thu, 18 Jun 2015 07:51:30 +0000 (09:51 +0200)
committericeman1001 <iceman@iuse.se>
Thu, 18 Jun 2015 07:51:30 +0000 (09:51 +0200)
commitb69adb794594cc7ea43d3aa70aab091265195abf
treed1836853ffe985cdc2cb73090aeddf5c8fc97f8b
parent553e868f250528a1dd687f2ec5232b9f6336daa1
parent26fbe1fbd9705bc53a423f41e346323069a93e3e
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iso14443a.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/Makefile
client/cmddata.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/lualibs/utils.lua
client/scripting.c
client/scripts/didump.lua
client/util.c
client/util.h
common/crc16.c
common/lfdemod.c
common/sha1.c
Impressum, Datenschutz