dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,632 Commits 7 Branches 1 Tag
8ce3e4b4e937f2e3b2fda5b0d5d2c6bd9c6b3ebc
Commit Graph

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