Commit graph

11 commits

Author SHA1 Message Date
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
Drewgoo b0c76dd2cf Update README.txt
typo
2015-04-28 22:47:49 -06:00
iceman1001 b1329a0264 chg: updated the README.txt
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
2015-01-02 00:09:59 +01:00
iceman1001 0a966150a0 Updated the README.txt
CHG:  added marshmellows last changes with rtrim, and minor fixes.
DEL:  code cleanup in usb_cdc.c
2015-01-01 14:07:42 +01:00
Martin Holst Swende 3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
2014-06-28 20:52:37 +02:00
penturalabs c3963755b7 Implement replay command. 2014-04-15 11:47:01 +01:00
W8M2Hg9lLmWqXSGC b27c190924 Update README.txt
Removed old information.
2014-03-26 15:12:32 +11:00
W8M2Hg9lLmWqXSGC 5e0b213d7f Added an important notice.
Moving the repository from google code to GitHub is up for discussion!
Please check out the following thread and post your comments...
http://www.proxmark.org/forum/viewtopic.php?id=1902
Discussions will close on March 31st.
2014-03-17 15:41:33 +11:00
bushing 770f73457a setting svn:eol-style=native on files, part 1
(see http://svnbook.red-bean.com/en/1.4/svn.advanced.props.file-portability.html)
2010-02-22 19:18:49 +00:00
adam@algroup.co.uk afb8304a7b make a start on updating the main README 2010-02-21 10:23:05 +00:00
edouard@lafargue.name 6658905f18 Initial commit for the firmware. Used the 20090306_ela version as baseline.
It is identical to the popular 20081211, with the doob addition (20090301), a
linux client, and two additional commands for LF analysis. Let me know if
you find issues here!
2009-04-09 06:43:20 +00:00