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: 3a72fdf 0387cd3)

author	iceman1001 <iceman@iuse.se>
	Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)
committer	iceman1001 <iceman@iuse.se>
	Thu, 19 Feb 2015 10:32:11 +0000 (11:32 +0100)
commit	f4a57e861d88657e58ef01cb96ce732d588ca91f
tree	6883a51152a3c675b241fdd8c45f46fec90259d1	tree \| snapshot
parent	3a72fdf5b0d1ed3e8c94556ff5e24aa20843636d	commit \| diff
parent	0387cd3393d87edf07cdd37dc942b6e561ce499a	commit \| diff

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

Conflicts:
armsrc/iclass.c
client/loclass/cipher.c
client/loclass/fileutils.h

armsrc/Makefile	diff1 \|	diff2 \|	blob \| history
armsrc/iclass.c	diff1 \|	diff2 \|	blob \| history
client/Makefile	diff1 \|	diff2 \|	blob \| history
client/cmddata.c	diff1 \|	diff2 \|	blob \| history
client/loclass/cipher.c	diff1 \|	diff2 \|	blob \| history
client/loclass/fileutils.h	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz