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: ee97a92 3989d6f)

author	iceman1001 <iceman@iuse.se>
	Tue, 16 Feb 2016 20:43:45 +0000 (21:43 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 16 Feb 2016 20:43:45 +0000 (21:43 +0100)
commit	7504dc50d539f1f9b0b99064f5c7d38e373890fa
tree	b4ed111291f60c05e0bec635da41f765b2d59dfc	tree \| snapshot
parent	ee97a92adbf2009117c6c76e82bbdb57746355ae	commit \| diff
parent	3989d6fff6a686f2e7b3fa2242592ecf897d7ee4	commit \| diff

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

Conflicts:
armsrc/crypto1.c

armsrc/iso14443a.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifarecmd.c	diff1 \|	diff2 \|	blob \| history
tools/mfkey/Makefile	diff1 \|	diff2 \|	blob \| history
tools/nonce2key/Makefile	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz