]> git.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Thu, 12 Feb 2015 08:54:21 +0000 (09:54 +0100)
committericeman1001 <iceman@iuse.se>
Thu, 12 Feb 2015 08:54:21 +0000 (09:54 +0100)
commit31b3689f0b54048de31957e001c60bbd8dfca5a3
tree324761935ee8bcf61b9fcd78100e3c7edcc5b2d7
parent0310364d23a511d131c3e2dcc2cc752c3c1d4562
parent8b9393d3bd2c7fb4761b8317673b63ee96621b22
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/epa.c
armsrc/epa.c
armsrc/iso14443a.h
client/Makefile
client/cmdlf.c
client/cmdlft55xx.c
Impressum, Datenschutz