]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/iceman1001/proxmark3
authoriceman <iceman@iuse.se>
Wed, 10 Feb 2016 12:29:23 +0000 (13:29 +0100)
committericeman <iceman@iuse.se>
Wed, 10 Feb 2016 12:29:23 +0000 (13:29 +0100)
commit480e2f239421563263d07f6d11f2c929d7f14d1f
tree459e088a4c0f07bc087ee9f0f0db707434994ec0
parent719b2377bee69506572b54af1e210b62c296675c
parenta9e4e78f83b2743a86df77d4dc94878f4536a00a
Merge branch 'master' of https://github.com/iceman1001/proxmark3

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