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: e57fe79 146c201)

author	iceman1001 <iceman@iuse.se>
	Tue, 10 Feb 2015 07:58:14 +0000 (08:58 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 10 Feb 2015 07:58:14 +0000 (08:58 +0100)
commit	2b61c242127b54c6f8a92bf6991cdf9bd9aa27af
tree	b5212b2111ed45f58f8ff9543eaf5358227f8b3b	tree \| snapshot
parent	e57fe796f529d3edd7d48f1fa51676e809531280	commit \| diff
parent	146c201cbe67cf3967cb497b3d67fb579c3ccb0e	commit \| diff

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

Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/lfops.c

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

Proxmark3 GIT tracking

Impressum, Datenschutz