Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
committericeman1001 <iceman@iuse.se>
Wed, 7 Jan 2015 10:09:05 +0000 (11:09 +0100)
1  2 
armsrc/iclass.c
client/cmdhficlass.c
client/loclass/fileutils.c

diff --cc armsrc/iclass.c
Simple merge
Simple merge
Simple merge
Impressum, Datenschutz