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

]> git.zerfleddert.de Git - proxmark3-svn/commit

author	iceman1001 <iceman@iuse.se>
	Sat, 23 May 2015 06:16:40 +0000 (08:16 +0200)
committer	iceman1001 <iceman@iuse.se>
	Sat, 23 May 2015 06:16:40 +0000 (08:16 +0200)
commit	bcf61bd34ab2747580aabf648093e5854b7283ed
tree	b5fdafaef2d7541714fa3c7e23c23273d524b86a	tree \| snapshot
parent	a7e7cd419a820f5208c4920b4fd3ebd7222e5db3	commit \| diff
parent	86724c17c9914f495e2a7df729d4fe65a9746d82	commit \| diff

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

Conflicts:
README.txt
armsrc/appmain.c
armsrc/apps.h
armsrc/des.c
armsrc/iclass.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
client/cmddata.c
client/cmdhf.c
client/cmdhf14a.c
client/cmdhficlass.c
client/cmdhfmfu.c
client/cmdhfmfu.h
client/cmdscript.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/scripting.c
client/util.c
common/protocols.h
include/usb_cmd.h

19 files changed:

README.txt	diff1 \|	diff2 \|	blob \| history
armsrc/appmain.c	diff1 \|	diff2 \|	blob \| history
armsrc/des.h	diff1 \|	diff2 \|	blob \| history
armsrc/iso14443a.c	diff1 \|	diff2 \|	blob \| history
armsrc/lfops.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifarecmd.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifareutil.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifareutil.h	diff1 \|	diff2 \|	blob \| history
client/cmdhf.c	diff1 \|	diff2 \|	blob \| history
client/cmdhficlass.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmf.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmfu.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmfu.h	diff1 \|	diff2 \|	blob \| history
client/lualibs/html_dumplib.lua	diff1 \|	diff2 \|	blob \| history
client/nonce2key/crapto1.c	diff1 \|	diff2 \|	blob \| history
client/scripting.c	diff1 \|	diff2 \|	blob \| history
client/util.c	diff1 \|	diff2 \|	blob \| history
common/protocols.h	diff1 \|	diff2 \|	blob \| history
include/usb_cmd.h	diff1 \|	diff2 \|	blob \| history

Proxmark3 GIT tracking

RSS Atom

Impressum, Datenschutz

README.txt	diff1 \|	diff2 \|	blob \| history
armsrc/appmain.c	diff1 \|	diff2 \|	blob \| history
armsrc/des.h	diff1 \|	diff2 \|	blob \| history
armsrc/iso14443a.c	diff1 \|	diff2 \|	blob \| history
armsrc/lfops.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifarecmd.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifareutil.c	diff1 \|	diff2 \|	blob \| history
armsrc/mifareutil.h	diff1 \|	diff2 \|	blob \| history
client/cmdhf.c	diff1 \|	diff2 \|	blob \| history
client/cmdhficlass.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmf.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmfu.c	diff1 \|	diff2 \|	blob \| history
client/cmdhfmfu.h	diff1 \|	diff2 \|	blob \| history
client/lualibs/html_dumplib.lua	diff1 \|	diff2 \|	blob \| history
client/nonce2key/crapto1.c	diff1 \|	diff2 \|	blob \| history
client/scripting.c	diff1 \|	diff2 \|	blob \| history
client/util.c	diff1 \|	diff2 \|	blob \| history
common/protocols.h	diff1 \|	diff2 \|	blob \| history
include/usb_cmd.h	diff1 \|	diff2 \|	blob \| history