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: a631936 b689b84)

author	iceman1001 <iceman@iuse.se>
	Tue, 20 Jan 2015 08:32:53 +0000 (09:32 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 20 Jan 2015 08:32:53 +0000 (09:32 +0100)
commit	5149e37e66dd3324905ec7e18e67798b03f16ef6
tree	7d91ca202e03f9ddb3f6fc0c3e3959a637322de0	tree \| snapshot
parent	a631936e84fa35d04bef9c45928ee602a258d6c4	commit \| diff
parent	b689b842b68c061340f18ff595ffdabf34bdc4f0	commit \| diff

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

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

armsrc/appmain.c	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/mifarecmd.c	diff1 \|	diff2 \|	blob \| history
client/lualibs/commands.lua	diff1 \|	diff2 \|	blob \| history
client/lualibs/utils.lua	diff1 \|	diff2 \|	blob \| history
client/scripts/tnp3dump.lua	diff1 \|	diff2 \|	blob \| history
client/scripts/tnp3sim.lua	diff1 \|	diff2 \|	blob \| history
common/cmd.h	diff1 \|	diff2 \|	blob \| history
common/usb_cdc.h	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz