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/cmdmain.c
+++ b/client/cmdmain.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include "sleep.h"
+#include "util_posix.h"
 #include "cmdparser.h"
 #include "proxmark3.h"
 #include "data.h"