From: iceman1001 <iceman@iuse.se>
Date: Tue, 24 Mar 2015 10:45:31 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0ec548dc2122f9bc0f0b536db5fa1a12f1f5c16a?ds=sidebyside;hp=0ec548dc2122f9bc0f0b536db5fa1a12f1f5c16a

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

Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
---