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: 5149e37 f164662)

author	iceman1001 <iceman@iuse.se>
	Tue, 20 Jan 2015 19:59:24 +0000 (20:59 +0100)
committer	iceman1001 <iceman@iuse.se>
	Tue, 20 Jan 2015 19:59:24 +0000 (20:59 +0100)
commit	c8b6da2295a35cda0232f147993a0ed6ff68b207
tree	db573b0f2e1d325106767793caf905b63d67f07b	tree \| snapshot
parent	5149e37e66dd3324905ec7e18e67798b03f16ef6	commit \| diff
parent	f164662363901292b83d452b107a4f630473144a	commit \| diff

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

Conflicts:
armsrc/appmain.c
armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c

armsrc/apps.h	diff1 \|	diff2 \|	blob \| history
armsrc/iso14443a.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifarecmd.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifaresniff.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifareutil.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifareutil.h	diff1 \|	diff2 \|	blob \| history
client/Makefile	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

Impressum, Datenschutz