dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,125 Commits 7 Branches 1 Tag
bf2cd6440689563add52ea8d64f736ae6ed6d676
Commit Graph

3 Commits

Author SHA1 Message Date
iceman1001
a11ca2f305 FIX: @wllm-rbnt 's typo fixes 2016-02-12 07:37:10 +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