]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
projects / proxmark3-svn / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2736c4 098015e)
Merge pull request #160 from marshmellow42/master
authorMartin Holst Swende <martin@swende.se>
Mon, 15 Feb 2016 17:39:42 +0000 (18:39 +0100)
committerMartin Holst Swende <martin@swende.se>
Mon, 15 Feb 2016 17:39:42 +0000 (18:39 +0100)
lf viking and standalone bug fixes


Trivial merge
Proxmark3 GIT tracking
Impressum, Datenschutz