Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts: armsrc/appmain.c armsrc/apps.h
2015-01-20 09:32:53 +01:00
parent a631936e84 b689b842b6
commit 5149e37e66
42 changed files with 4768 additions and 321 deletions
--- a/common/usb_cdc.h
+++ b/common/usb_cdc.h
@@ -35,7 +35,7 @@
 #ifndef _USB_CDC_H_
 #define _USB_CDC_H_

-#include <common.h>
+#include "common.h"

 void usb_disable();
 void usb_enable();