| commit | c8b6da2295a35cda0232f147993a0ed6ff68b207 | |
| author | iceman1001 <iceman@iuse.se> | |
| Tue, 20 Jan 2015 19:59:24 +0000 (20 20:59 +0100) | ||
| committer | iceman1001 <iceman@iuse.se> | |
| Tue, 20 Jan 2015 19:59:24 +0000 (20 20:59 +0100) | ||
| tree | db573b0f2e1d325106767793caf905b63d67f07b | treesnapshot (tar.gz zip) |
| parent | 5149e37e66dd3324905ec7e18e67798b03f16ef6 | commitdiff |
| parent | f164662363901292b83d452b107a4f630473144a | commitdiff |
Merge branch 'master' of https://github.com/holiman/proxmark3
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c
Conflicts:
armsrc/appmain.c
armsrc/apps.h
Step 1 for the Ultralight / Ultralight-c