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

Conflicts:
	client/cmddata.c
	client/cmddata.h
	client/cmdhfmf.c
	client/cmdlf.c
	client/cmdlfem4x.h
	client/cmdlft55xx.c
	client/lualibs/default_toys.lua
	client/scripts/tnp3clone.lua
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua

2015-04-24 19:04:01 +02:00

..

14araw.lua

…

cmdline.lua

…

dumptoemul.lua

Some more lua-scripts and library fixes from iceman, including more default keys

2014-08-29 09:11:36 +02:00

emul2dump.lua

Various scripts from iceman

2014-08-29 09:09:23 +02:00

emul2html.lua

Script to convert emulator file (ASCII dump of data) into HTML

2013-10-20 18:48:04 +00:00

formatMifare.lua

ADD: tnp3xxx identification in luascripts.

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

hf_read.lua

Some more tinkering with a generic 13.56MHz reader, still not finished

2013-10-31 10:35:03 +00:00

htmldump.lua

…

mfkeys.lua

…

mifare_autopwn.lua

ADD: tnp3xxx identification in luascripts.

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

ndef_dump.lua

added nexwatch demod & iceman lua

2015-04-08 14:19:03 -04:00

parameters.lua

…

remagic.lua

STEP 3 - the actual new files for Ultralight.

2015-01-20 21:29:55 +01:00

test_t55x7_ask.lua

lf t5xx - icemans update

2015-04-05 16:37:41 -04:00

test_t55x7_bi.lua

lf t5xx - icemans update

2015-04-05 16:37:41 -04:00

test_t55x7_fsk.lua

lf t5xx - icemans update

2015-04-05 16:37:41 -04:00

test_t55x7_psk.lua

lf t5xx - icemans update

2015-04-05 16:37:41 -04:00

tnp3clone.lua

ADD: found another sub-type,

2015-04-24 18:35:09 +02:00

tnp3dump.lua

CHG: some minor code cleanup.

2015-04-24 18:36:11 +02:00

tnp3sim.lua

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

2015-04-24 19:04:01 +02:00

tracetest.lua

lf t5 read plus lf demod adjustments

2015-03-22 15:28:48 -04:00