]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Mon, 16 Feb 2015 17:59:44 +0000 (18:59 +0100)
committericeman1001 <iceman@iuse.se>
Mon, 16 Feb 2015 17:59:44 +0000 (18:59 +0100)
commitd716ca2fc1062c3c7f67cb52b0799df32adf6b0d
treeeece95b7931c5881d49c669c0d8b48334d50a9e2
parent6af88242eb458bad91c77b424b03bf19ecce5da1
parente80aeb969524acf070170d4224b8fb660e6c19f6
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c
armsrc/appmain.c
armsrc/iclass.c
armsrc/lfops.c
include/usb_cmd.h
Impressum, Datenschutz