Public Git Hosting - legacy-proxmark3.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3e7df26 087c8bf)

commit	8040afa5ba915a022e28c0d61c81b773d4ed6686
author	Iceman <iceman@iuse.se>
	Fri, 9 Jun 2017 13:50:55 +0000 (9 15:50 +0200)
committer	GitHub <noreply@github.com>
	Fri, 9 Jun 2017 13:50:55 +0000 (9 15:50 +0200)
tree	a84d8bfef6288565dca5b5c945112796f3dc3402	tree \| snapshot (tar.gz zip)
parent	3e7df26213de1922031279c1f1e42512db4e28b8	commit \| diff
parent	087c8bf3303e69d79cbbfdfb8edc836587cfb820	commit \| diff

Merge pull request #315 from marshmellow42/master

fix compile issues on OS X 10.11

Proxmark3 - the RFID research Swiss army knife. Official firmware