]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Mon, 25 May 2015 11:13:06 +0000 (13:13 +0200)
committericeman1001 <iceman@iuse.se>
Mon, 25 May 2015 11:13:06 +0000 (13:13 +0200)
commitc068ebb78f2e4070fcf1a604df0d7088374b60c6
treef751b100f1481ae76593fa61f7128597a16030a2
parent46cd801c5ad5d5f60b2526b4a1e6700a2a008f7b
parent96c4f5517eea0b14fa2452d94053244110058a62
Merge branch 'master' of https://github.com/Proxmark/proxmark3

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