]> cvs.zerfleddert.de Git - proxmark3-svn/commit - client/cmdlft55xx.c
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)
commit4ecde0e1ff60d5e3d217dc1e5ca12c78864804cc
tree4ce59688093ccb94f01e1dd6ff4bb03fe7bace97
parent1e3a799d47fc551bb9c1611c6d7db47844dd03b7
parent24cbeb3d27432bb5069c94a7d61c986e32d97285
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/iclass.c
armsrc/appmain.c
armsrc/apps.h
armsrc/hitag2.c
armsrc/iclass.c
armsrc/iso14443.c
armsrc/iso14443a.h
armsrc/util.c
client/cmdlft55xx.c
client/ui.c
Impressum, Datenschutz