]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Mon, 30 Mar 2015 19:11:37 +0000 (21:11 +0200)
committericeman1001 <iceman@iuse.se>
Mon, 30 Mar 2015 19:11:37 +0000 (21:11 +0200)
commit02d352fea75385d80b49a7ab8703692ae307f073
treec7657653b029c67aac895871608b46a25ab6ae31
parentec09716a65c29dffaedcc232c0b6414bc7e0c598
parent616970b3d1022d4f4e9685e5529933065dca3545
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c
armsrc/lfops.c
client/cmdlf.c
common/lfdemod.c
include/usb_cmd.h
armsrc/iclass.c
client/graph.c
common/ldscript.common
common/lfdemod.h
include/usb_cmd.h
Impressum, Datenschutz