?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2e7e107 2147c30)
Merge pull request #80 from marshmellow42/master
commit29a795417777b7c4f4313b6915c5aa4726ce3429
authorMartin Holst Swende <martin@swende.se>
Mon, 16 Mar 2015 13:03:48 +0000 (16 14:03 +0100)
committerMartin Holst Swende <martin@swende.se>
Mon, 16 Mar 2015 13:03:48 +0000 (16 14:03 +0100)
tree3ff622db486c0dcccf7525ca933aacaec371d518tree | snapshot (tar.gz zip)
parent2e7e107c821e129a57ef1d40d9a5b3208deec2e4commit | diff
parent2147c307785639944f4843d7cf0d245778532ecfcommit | diff
Merge pull request #80 from marshmellow42/master

FIX EM Error
Proxmark3 - the RFID research Swiss army knife. Official firmware