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: ec09716 616970b)

author	iceman1001 <iceman@iuse.se>
	Mon, 30 Mar 2015 19:11:37 +0000 (21:11 +0200)
committer	iceman1001 <iceman@iuse.se>
	Mon, 30 Mar 2015 19:11:37 +0000 (21:11 +0200)
commit	02d352fea75385d80b49a7ab8703692ae307f073
tree	c7657653b029c67aac895871608b46a25ab6ae31	tree \| snapshot
parent	ec09716a65c29dffaedcc232c0b6414bc7e0c598	commit \| diff
parent	616970b3d1022d4f4e9685e5529933065dca3545	commit \| diff

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

Conflicts:
armsrc/iclass.c
armsrc/lfops.c
client/cmdlf.c
common/lfdemod.c
include/usb_cmd.h

armsrc/iclass.c	diff1 \|	diff2 \|	blob \| history
client/graph.c	diff1 \|	diff2 \|	blob \| history
common/ldscript.common	diff1 \|	diff2 \|	blob \| history
common/lfdemod.h	diff1 \|	diff2 \|	blob \| history
include/usb_cmd.h	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz