Merge branch 'master' into topaz
authorpwpiwi <pwpiwi@users.noreply.github.com>
Tue, 25 Aug 2015 05:53:00 +0000 (07:53 +0200)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Tue, 25 Aug 2015 05:53:00 +0000 (07:53 +0200)
commit8e21541e77dd0909a99a1ed1106a6df87d34a247
treeaa9b8a1e1d861c2f31478d6a38ff6009579536f0
parentdb2b81ba11bdb125a7ee22b226729f4c70acb1ad
parent5d01f50ae1be5c7de81cc089d60d3bdbf80dc738
Merge branch 'master' into topaz
armsrc/BigBuf.c
armsrc/iso14443a.c
client/Makefile
client/cmdhf.c
Impressum, Datenschutz