Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts: armsrc/appmain.c armsrc/apps.h
This commit is contained in:
commit
5149e37e66
42 files changed
+4768
-321
No files matched your search
+1
-1
@@ -35,7 +35,7 @@
|
||||
#ifndef _USB_CDC_H_
|
||||
#define _USB_CDC_H_
|
||||
|
||||
#include <common.h>
|
||||
#include "common.h"
|
||||
|
||||
void usb_disable();
|
||||
void usb_enable();
|
||||
|
||||
Reference in new issue
Block a user