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: 2b61c24 92bf686)

author	iceman1001 <iceman@iuse.se>
	Tue, 10 Feb 2015 08:01:31 +0000 (09:01 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 10 Feb 2015 08:01:31 +0000 (09:01 +0100)
commit	1e3a799d47fc551bb9c1611c6d7db47844dd03b7
tree	c1123d573f9c42bf2f0601efcc5cff3c025bf36f	tree \| snapshot
parent	2b61c242127b54c6f8a92bf6991cdf9bd9aa27af	commit \| diff
parent	92bf6868178c8716d6fe3f526fbff55ecad37023	commit \| diff

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

armsrc/appmain.c	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/lfops.c	diff1 \|	diff2 \|	blob \| history
client/cmddata.c	diff1 \|	diff2 \|	blob \| history
client/cmddata.h	diff1 \|	diff2 \|	blob \| history
client/mifarehost.c	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz