]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
projects / proxmark3-svn / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b35e04a 75e42ef)
Merge branch 'master' into fix_hfmfsim 462/head
authorpwpiwi <pwpiwi@users.noreply.github.com>
Thu, 2 Nov 2017 20:37:42 +0000 (21:37 +0100)
committerpwpiwi <pwpiwi@users.noreply.github.com>
Thu, 2 Nov 2017 20:37:42 +0000 (21:37 +0100)
1  2 
armsrc/iso14443a.c patch | diff1 | diff2 | blob | history

diff --cc armsrc/iso14443a.c
Simple merge
Proxmark3 GIT tracking
Impressum, Datenschutz