Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3
authormerlokk <olegmsn@gmail.com>
Wed, 1 Nov 2017 15:13:27 +0000 (17:13 +0200)
committermerlokk <olegmsn@gmail.com>
Wed, 1 Nov 2017 15:13:27 +0000 (17:13 +0200)
commitbed3e4c20d2d885dbc560d21c1e954058145ae51
treeb4552be866a9a5f0e59f6cbc45cdffde4ae8c2f4
parent89ec86abd293e6294223e971278caf4aad2be190
parent9d139870cb3569144616c8752d68e30f9b9b9074
Merge branch 'master' of github.com:merlokk/proxmark3 into 14a_rework3
armsrc/iso14443a.c
client/cmdhf14a.c
client/cmdhf14a.h
Impressum, Datenschutz