2 Commits

Author	SHA1	Message	Date
iceman1001	5149e37e66	Merge branch 'master' of https://github.com/Proxmark/proxmark3 ... Conflicts: armsrc/appmain.c armsrc/apps.h	2015-01-20 09:32:53 +01:00
roel@libnfc.org	28fdb04fd8	Finally, rewrote bootrom and flasher program, much faster now	2013-02-28 15:11:52 +00:00