Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
This commit is contained in:
iceman1001 committed 2015-01-20 09:32:53 +01:00
commit 5149e37e66
42 files changed
+4768 -321

No files matched your search

+2 -2
View File
@@ -33,8 +33,8 @@
#ifndef _PROXMARK_CMD_H_
#define _PROXMARK_CMD_H_
#include <common.h>
#include <usb_cmd.h>
#include "common.h"
#include "usb_cmd.h"
#include "usb_cdc.h"
bool cmd_receive(UsbCommand* cmd);