Merge branch 'master' of https://github.com/Proxmark/proxmark3
authoriceman1001 <iceman@iuse.se>
Tue, 20 Jan 2015 08:32:53 +0000 (09:32 +0100)
committericeman1001 <iceman@iuse.se>
Tue, 20 Jan 2015 08:32:53 +0000 (09:32 +0100)
commit5149e37e66dd3324905ec7e18e67798b03f16ef6
tree7d91ca202e03f9ddb3f6fc0c3e3959a637322de0
parenta631936e84fa35d04bef9c45928ee602a258d6c4
parentb689b842b68c061340f18ff595ffdabf34bdc4f0
Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
armsrc/appmain.c
armsrc/apps.h
armsrc/appmain.c
armsrc/apps.h
armsrc/mifarecmd.c
client/lualibs/commands.lua
client/lualibs/utils.lua
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
common/cmd.h
common/usb_cdc.h
Impressum, Datenschutz