?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 90a8b82 327a690)
Merge pull request #84 from marshmellow42/master
commit062e28912cecfe3a340ea1688b01ba37b1d7212f
authorMartin Holst Swende <martin@swende.se>
Wed, 25 Mar 2015 10:10:51 +0000 (25 11:10 +0100)
committerMartin Holst Swende <martin@swende.se>
Wed, 25 Mar 2015 10:10:51 +0000 (25 11:10 +0100)
tree18a25563ce029c9a135829a968e27fafdbc91480tree | snapshot (tar.gz zip)
parent90a8b82fb4ffc8f25038bb3ed10082cf913d50bbcommit | diff
parent327a690813ff04d580a2630977f160b8ec809bd9commit | diff
Merge pull request #84 from marshmellow42/master

EM410x bug fix
Proxmark3 - the RFID research Swiss army knife. Official firmware