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: 1e3a799 24cbeb3)

author	iceman1001 <iceman@iuse.se>
	Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 10 Feb 2015 20:53:16 +0000 (21:53 +0100)
commit	4ecde0e1ff60d5e3d217dc1e5ca12c78864804cc
tree	4ce59688093ccb94f01e1dd6ff4bb03fe7bace97	tree \| snapshot
parent	1e3a799d47fc551bb9c1611c6d7db47844dd03b7	commit \| diff
parent	24cbeb3d27432bb5069c94a7d61c986e32d97285	commit \| diff

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

Conflicts:
armsrc/appmain.c
armsrc/iclass.c

armsrc/appmain.c	diff1 \|	diff2 \|	blob \| history
armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/hitag2.c	diff1 \|	diff2 \|	blob \| history
armsrc/iclass.c	diff1 \|	diff2 \|	blob \| history
armsrc/iso14443.c	diff1 \|	diff2 \|	blob \| history
armsrc/iso14443a.h	diff1 \|	diff2 \|	blob \| history
armsrc/util.c	diff1 \|	diff2 \|	blob \| history
client/cmdlft55xx.c	diff1 \|	diff2 \|	blob \| history
client/ui.c	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz