]> cvs.zerfleddert.de Git - proxmark3-svn/commit
Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)
committericeman1001 <iceman@iuse.se>
Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)
commitf4a57e861d88657e58ef01cb96ce732d588ca91f
tree6883a51152a3c675b241fdd8c45f46fec90259d1
parent3a72fdf5b0d1ed3e8c94556ff5e24aa20843636d
parent0387cd3393d87edf07cdd37dc942b6e561ce499a
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h
armsrc/Makefile
armsrc/iclass.c
client/Makefile
client/cmddata.c
client/loclass/cipher.c
client/loclass/fileutils.h
Impressum, Datenschutz