dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research

Browse Source 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
This commit is contained in:
Martin Holst Swende
2014-06-28 20:52:37 +02:00
parent 6c0f60ca7b fecd8202a5
commit 3ad48540d4
24 changed files with 4222 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.txt
View File

@@ -85,4 +85,3 @@ Jonathan Westhues
user jwesthues, at host cq.cx
May 2007, Cambridge MA