monster merge...

all those changes marshmellow did.. and more...
2017-07-30 09:17:48 +02:00
parent 208550823d
commit f28da2da6e
107 changed files with 5087 additions and 3777 deletions
--- a/client/flash.h
+++ b/client/flash.h
@@ -10,7 +10,17 @@
 #define __FLASH_H__

 #include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include "proxmark3.h"
 #include "elf.h"
+#include "proxendian.h"
+#include "usb_cmd.h"
+#include "at91sam7s512.h"
+#include "util_posix.h"

 typedef struct {
 	void *data;