?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 6cb0855 799b2e2)
Merge pull request #111 from zhovner/master
commitdaf8b85cdaed21ace94bae1a49526d09ea389c73
authorMartin Holst Swende <martin@swende.se>
Mon, 1 Jun 2015 17:56:50 +0000 (1 19:56 +0200)
committerMartin Holst Swende <martin@swende.se>
Mon, 1 Jun 2015 17:56:50 +0000 (1 19:56 +0200)
tree65c81e1c1051fb2b08043f370a07422ad894a1bdtree | snapshot (tar.gz zip)
parent6cb08550c40e94e1662ca8351dcca5139615ee66commit | diff
parent799b2e2e9da62c96a30e9a04da911ff3cbe8cbd9commit | diff
Merge pull request #111 from zhovner/master

Compiling manual for MAC OS X
Proxmark3 - the RFID research Swiss army knife. Official firmware