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: 652c39c 58e93ff)

author	iceman1001 <iceman@iuse.se>
	Tue, 10 Mar 2015 08:18:35 +0000 (09:18 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 10 Mar 2015 08:18:35 +0000 (09:18 +0100)
commit	12d708fec157dfde6f94d61e5fdc265713a71578
tree	75404d47e44b3c467bd186dbbadb826c92520259	tree \| snapshot
parent	652c39c63bce093cec80b174dfb0d8154e7c6827	commit \| diff
parent	58e93ff593ee67e1c41fa790110dc60f09b91cc4	commit \| diff

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

Conflicts:
client/cmddata.c
client/cmddata.h

armsrc/appmain.c	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/iso14443a.c	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/cmdlf.c	diff1 \|	diff2 \|	blob \| history
client/lualibs/commands.lua	diff1 \|	diff2 \|	blob \| history
include/usb_cmd.h	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz