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

Conflicts:
	armsrc/iclass.c
	armsrc/lfops.c
	client/cmdlf.c
	common/lfdemod.c
	include/usb_cmd.h

2015-03-30 21:11:37 +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

2015-01-28 07:18:51 +01:00

legic_prng.h

legic write/simulate [Anon]

2010-05-06 11:24:01 +00:00

mifare.h

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

2015-03-24 11:45:31 +01:00

proxmark3.h

ADD: tnp3xxx identification in luascripts.

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

usb_cmd.h

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

2015-03-30 21:11:37 +02:00