Commit graph

4 commits

Author SHA1 Message Date
Martin Holst Swende
26f202e22f Change copyright to allow GPLV3, for https://github.com/Proxmark/proxmark3/issues/527 2017-12-27 08:44:27 +01:00
William Robinet
b8140ab108 Fix typos 2016-02-11 23:03:15 +01:00
Martin Holst Swende
d60418a05f Synchronized loclass library, imported the legal warning 2015-01-15 16:30:05 +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