Merge branch 'master' of https://github.com/holiman/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 20 Jan 2015 19:59:24 +0000 (20:59 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 20 Jan 2015 19:59:24 +0000 (20:59 +0100)
commitc8b6da2295a35cda0232f147993a0ed6ff68b207
treedb573b0f2e1d325106767793caf905b63d67f07b
parent5149e37e66dd3324905ec7e18e67798b03f16ef6
parentf164662363901292b83d452b107a4f630473144a
Merge branch 'master' of https://github.com/holiman/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c
armsrc/apps.h
armsrc/iso14443a.c
armsrc/mifarecmd.c
armsrc/mifaresniff.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/Makefile
Impressum, Datenschutz