]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' into GenericTracing 58/head
authorMartin Holst Swende <martin@swende.se>
Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)
committerMartin Holst Swende <martin@swende.se>
Tue, 10 Feb 2015 20:25:14 +0000 (21:25 +0100)
commit61972abbdd0a03832cae7d5ae58548fed11e619e
tree14e9c3ac4ce01aef290249b85b47d1874dd91910
parentbeefe5bc4dd7df83b618f02c25083bd27861942d
parent92bf6868178c8716d6fe3f526fbff55ecad37023
Merge branch 'master' into GenericTracing

Conflicts:
armsrc/iso14443a.c
armsrc/appmain.c
armsrc/apps.h
armsrc/iso14443a.c
Impressum, Datenschutz