git.zerfleddert.de Git - proxmark3-svn/commit

]> git.zerfleddert.de Git - proxmark3-svn/commit

projects / proxmark3-svn / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f4a57e8 7843130)

author	iceman1001 <iceman@iuse.se>
	Fri, 6 Mar 2015 08:02:15 +0000 (09:02 +0100)
committer	iceman1001 <iceman@iuse.se>
	Fri, 6 Mar 2015 08:02:15 +0000 (09:02 +0100)
commit	3ac59c7fed24cc69e2c9f626e5e4392769779e13
tree	b9ecb9f961137215605272a421146c246c52ba0b	tree \| snapshot
parent	f4a57e861d88657e58ef01cb96ce732d588ca91f	commit \| diff
parent	7843130a589d29acc2f27a3a96c057e01f881025	commit \| diff

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

Conflicts:
armsrc/crapto1.c
armsrc/iclass.c
client/nonce2key/crapto1.c

armsrc/Makefile	diff1 \|	diff2 \|	blob \| history
armsrc/crapto1.c	diff1 \|	diff2 \|	blob \| history
armsrc/iclass.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifarecmd.c	diff1 \|	diff2 \|	blob \| history
client/cmddata.c	diff1 \|	diff2 \|	blob \| history
client/cmddata.h	diff1 \|	diff2 \|	blob \| history
client/cmdhf15.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmf.c	diff1 \|	diff2 \|	blob \| history
client/lualibs/mf_default_keys.lua	diff1 \|	diff2 \|	blob \| history
client/lualibs/utils.lua	diff1 \|	diff2 \|	blob \| history
client/nonce2key/crapto1.c	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz