cvs.zerfleddert.de Git - proxmark3-svn/commit

]> cvs.zerfleddert.de Git - proxmark3-svn/commit - armsrc/mifaredesfire.c

author	iceman1001 <iceman@iuse.se>
	Fri, 19 Sep 2014 08:50:34 +0000 (10:50 +0200)
committer	iceman1001 <iceman@iuse.se>
	Fri, 19 Sep 2014 08:50:34 +0000 (10:50 +0200)
commit	75465377b93c9a27450a186342e9cfd2a84b4173
tree	da15118f617fec02afbf19474e0ffe55b4b46589	tree \| snapshot
parent	3d93d4f940e3251b3d18dfb1aa0839aa784cd573	commit \| diff
parent	92d255d3dc8fb9e567f3db035918249e6d083c35	commit \| diff

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

Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/iclass.c
client/Makefile
client/cmdhficlass.c
client/loclass/cipher.c
client/loclass/fileutils.c
client/loclass/ikeys.h
include/usb_cmd.h

armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/iclass.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifaredesfire.c	diff1 \|	\|	blob \| history
client/Makefile	diff1 \|	diff2 \|	blob \| history
client/cmdhficlass.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmfdes.c	diff1 \|	\|	blob \| history
client/cmdhfmfdes.h	diff1 \|	\|	blob \| history

Proxmark3 GIT tracking

RSS Atom

Impressum, Datenschutz

armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/iclass.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifaredesfire.c	diff1 \|	\|	blob \| history
client/Makefile	diff1 \|	diff2 \|	blob \| history
client/cmdhficlass.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmfdes.c	diff1 \|	\|	blob \| history
client/cmdhfmfdes.h	diff1 \|	\|	blob \| history