12 commits

Author	SHA1	Message	Date
Oleg Moiseenko	b7fa407830	Merge branch 'master' into fido	2018-11-12 15:06:21 +02:00
merlokk	f03261be9a	compiled. not linking....	2018-11-08 19:14:30 +02:00
merlokk	6ab12db7a0	mbedtls added	2018-11-07 18:05:02 +02:00
merlokk	ab5233d29f	now it needs to resolve issues in reveng	2018-10-11 11:48:46 +03:00
iceman1001	4e6140570e	fix: add dummy	2017-12-24 10:57:21 +01:00
iceman1001	1deb171573	add dummy.	2017-12-24 10:07:44 +01:00
iceman1001	a3e923c529	add: emv	2017-11-10 20:09:22 +01:00
iceman1001	5222785d69	some dummy files in order to keep folder structure ok when compiling.. ... removed some comments	2017-07-27 21:19:39 +02:00
iceman1001	96e41bfcec	add: a .gitignore to be able to add the folder client/obj/reveng.	2015-06-14 23:32:20 +02: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
Merlokbr@gmail.com	f89c705002	improved version of "hf 14a mifare" command ... with merge with utility nonce2key	2011-05-31 11:31:20 +00:00
bushing	cd00aa3043	merge linux and windows clients into one directory... will consolidate makefiles shortly	2009-12-22 12:11:15 +00:00