proxmark3

Files

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

Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h

2015-05-23 08:16:40 +02:00

at91sam7s512.h

ADD: tnp3xxx identification in luascripts.

2015-01-06 21:20:41 +01:00

common.h

moved RAMFUNC definition

2013-04-08 09:18:39 +00:00

config_gpio.h

Add license headers to armsrc/bootrom/common stuff

2010-02-21 00:12:52 +00:00

hitag2.h

BigBuf and tracing rework: allow much longer traces in in hf commands