From: iceman1001 <iceman@iuse.se>
Date: Tue, 20 Jan 2015 19:59:24 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/holiman/proxmark3
X-Git-Tag: v2.0.0-rc1~44^2~12
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/c8b6da2295a35cda0232f147993a0ed6ff68b207?hp=c8b6da2295a35cda0232f147993a0ed6ff68b207

Merge branch 'master' of https://github.com/holiman/proxmark3

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

Step 1 for the Ultralight / Ultralight-c
---