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

..

cmd.c

CHG: Minor code clean up.

2015-01-07 20:40:22 +01:00

cmd.h

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

2015-01-20 09:32:53 +01:00

crc16.c

CHG: Minor code clean up.

2015-01-07 20:40:22 +01:00

crc16.h

CHG: Minor code clean up.

2015-01-07 20:40:22 +01:00

crc32.c

FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.

2015-01-07 22:56:20 +01:00

crc32.h

FIX: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault.

2015-01-07 22:56:20 +01:00

crc64.c

scripting updates from @iceman1001

2015-05-13 21:14:35 -04:00

crc64.h

scripting updates from @iceman1001

2015-05-13 21:14:35 -04:00

crc.c

give credit where credit is due

2015-03-13 14:00:11 -04:00

crc.h

data psk demod minor fixes, pyramid demod add CS

2015-03-13 11:09:12 -04:00

default_version.c

Make version data const

2010-02-26 14:02:27 +00:00

desfire.h

chg: LF t55xx trace

2014-10-06 19:42:50 +02:00

iso14443crc.c

First check in.

2014-09-11 23:23:46 +02:00

iso14443crc.h

First check in.

2014-09-11 23:23:46 +02:00

iso15693tools.c

ADD: Holimans new changes in master.

2015-01-05 02:01:24 +01:00

iso15693tools.h

First check in.

2014-09-11 23:23:46 +02:00

ldscript.common

Reclaim more than 19K of ARM flash memory.

2015-03-31 08:07:26 +02:00

legic_prng.c

First check in.

2014-09-11 23:23:46 +02:00

lfdemod.c

lf ask consolidation

2015-04-08 01:07:39 -04:00

lfdemod.h

lf ask consolidation

2015-04-08 01:07:39 -04:00

Makefile.common

CHG: Added the parameters -fdata-sections -ffunction-sections to common/Makefile.common for making the .elf filesize smaller.

2015-03-30 16:27:07 +02:00

protocols.c

More work on iclass full simulation, and some work on iclass tag dump parsing

2015-02-19 10:48:33 +01:00

protocols.h

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

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

usb_cdc.c

Step 2 - Ultralight / Ultralight-C

2015-01-20 21:23:04 +01:00

usb_cdc.h

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

2015-01-20 09:32:53 +01:00