Merge remote-tracking branch 'Proxmark/master' into iclass
authormarshmellow42 <marshmellowrf@gmail.com>
Wed, 7 Oct 2015 13:34:47 +0000 (09:34 -0400)
committermarshmellow42 <marshmellowrf@gmail.com>
Wed, 7 Oct 2015 13:34:47 +0000 (09:34 -0400)
commitc54dff4f4ac42536ebd6faf32c7a76ebffdaadae
treeb7744df427f06cb7c61178689ee1d3128738752f
parent4ff341efff10cad8e063a73d67e9dab25b0cdf0f
parentdfb387bf0f73129f4bcb27eb4c840d9a35f390d6
Merge remote-tracking branch 'Proxmark/master' into iclass

Conflicts:
CHANGELOG.md
CHANGELOG.md
armsrc/appmain.c
armsrc/apps.h
client/cmdhfmf.c
client/lualibs/commands.lua
client/util.h
include/usb_cmd.h
Impressum, Datenschutz