Merge pull request #1 from Proxmark/master
authormarshmellow42 <marshmellow42@users.noreply.github.com>
Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
committermarshmellow42 <marshmellow42@users.noreply.github.com>
Mon, 29 Dec 2014 21:14:23 +0000 (16:14 -0500)
commit6bfa18eab4750123d0e24090597b0d4c7bd58daf
treef1a09361c5e9951847ffbae7ccf24cc7786d5490
parent2df8c07907a07068d717d9b4ddcc2848f4efd608
parent4be9e7507b65e131a7c69a8cf67bda11978c47b3
Merge pull request #1 from Proxmark/master

Test
armsrc/appmain.c
armsrc/apps.h
client/cmddata.c
Impressum, Datenschutz