]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Thu, 11 Sep 2014 21:29:14 +0000 (23:29 +0200)
committericeman1001 <iceman@iuse.se>
Thu, 11 Sep 2014 21:29:14 +0000 (23:29 +0200)
commit76c7e6c36368c3fc23dc4fab1fe5852023c78fac
tree69bdd9f0607a56572e921c0796f3905dd29bb6a3
parentf38a152863a5eb289acb169c5a38b4b77e87956e
parent79db03ef6302ab9cda439cff0bf5ab7808646a21
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
client/cmdhfmf.c
client/cmdhfmf.c
Impressum, Datenschutz