proxmark3/common
iceman1001 64d1b4efc9 Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
	armsrc/Makefile
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/epa.c
	armsrc/iclass.c
	armsrc/iso14443a.c
	armsrc/iso14443a.h
	armsrc/iso15693.c
	armsrc/lfops.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	armsrc/string.h
	armsrc/util.h
	bootrom/bootrom.c
	client/Makefile
	client/cmddata.c
	client/cmddata.h
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhf14b.c
	client/cmdhf15.c
	client/cmdhficlass.c
	client/cmdhfmf.c
	client/cmdhfmfu.c
	client/cmdlf.c
	client/cmdlfem4x.c
	client/cmdlfhid.c
	client/cmdlfhitag.c
	client/cmdlfio.c
	client/cmdmain.c
	client/data.h
	client/flash.c
	client/graph.c
	client/graph.h
	client/loclass/elite_crack.c
	client/loclass/fileutils.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/lualibs/mf_default_keys.lua
	client/lualibs/utils.lua
	client/mifarehost.c
	client/nonce2key/crapto1.c
	client/proxmark3.c
	client/scripting.c
	client/scripts/tnp3dump.lua
	client/scripts/tnp3sim.lua
	client/scripts/tracetest.lua
	common/Makefile.common
	common/cmd.c
	common/cmd.h
	common/lfdemod.c
	common/lfdemod.h
	common/usb_cdc.c
	common/usb_cdc.h
	include/usb_cmd.h
2015-01-29 21:39:33 +01: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
crc.c Add license headers to armsrc/bootrom/common stuff 2010-02-21 00:12:52 +00:00
crc.h First check in. 2014-09-11 23:23:46 +02: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
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 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
legic_prng.c First check in. 2014-09-11 23:23:46 +02:00
lfdemod.c lf demod bug fix & refactor 2015-01-27 14:51:12 -05:00
lfdemod.h lf demod bug fix & refactor 2015-01-27 14:51:12 -05:00
Makefile.common Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-29 21:39:33 +01: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