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

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse Source 
Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
This commit is contained in:
iceman1001
2015-02-19 11:32:11 +01:00
parent 3a72fdf5b0 0387cd3393
commit f4a57e861d
21 changed files with 1344 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/Makefile
View File

@@ -103,6 +103,7 @@ CMDSRCS = nonce2key/crapto1.c\
cmdscript.c\
pm3_bitlib.c\
aes.c\
protocols.c\
COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)