]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
Merge remote-tracking branch 'upstream/master' into iclass
authormarshmellow42 <marshmellowrf@gmail.com>
Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
committermarshmellow42 <marshmellowrf@gmail.com>
Tue, 21 Jul 2015 01:26:35 +0000 (21:26 -0400)
1  2 
armsrc/appmain.c
armsrc/apps.h
client/cmdlf.c
client/hid-flasher/usb_cmd.h
client/lualibs/commands.lua
include/usb_cmd.h

Simple merge
diff --cc armsrc/apps.h
Simple merge
diff --cc client/cmdlf.c
Simple merge
Simple merge
Simple merge
Simple merge
Impressum, Datenschutz