]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
projects / proxmark3-svn / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f7e30f ab981f0)
Merge branch 'master' of https://github.com/iceman1001/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 2 Aug 2016 14:06:40 +0000 (16:06 +0200)
committericeman1001 <iceman@iuse.se>
Tue, 2 Aug 2016 14:06:40 +0000 (16:06 +0200)
1  2 
client/cmdhflegic.c patch | diff1 | diff2 | blob | history

diff --cc client/cmdhflegic.c
Simple merge
Proxmark3 GIT tracking
Impressum, Datenschutz