Merge branch 'master' into 14a_rework3
authorOleg Moiseenko <olegmsn@gmail.com>
Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
committerGitHub <noreply@github.com>
Thu, 2 Nov 2017 12:14:55 +0000 (14:14 +0200)
commit378d3406cae2ab5d6f8c43fd933134d5395c4ddb
tree3b6e72bbc37c259ccebc00994e9fe5567aa90cbe
parent23207d748f65f97365a608f2a9abfc3ac5997413
parent75e42ef5dfc6868e696cbc13ef373d97a3040ada
Merge branch 'master' into 14a_rework3
armsrc/iso14443a.c
client/cmdhf14a.c
Impressum, Datenschutz