pwpiwi 6306ff4bac Merge branch 'master' into topaz ...

Conflicts:
	armsrc/Makefile
	client/Makefile

2015-04-05 19:45:59 +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

add: Topaz mode for "hf 14a raw" (new option -T)

2015-03-20 21:06:51 +01:00

proxmark3.h

ADD: tnp3xxx identification in luascripts.

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

usb_cmd.h

Minor mod to 'hf iclass read', it now also reads and prints the configuration of the tag found

2015-03-29 21:49:58 +02:00