Merging with current msvc.

2017-01-23 01:07:06 +11:00
parent 72a497bc14 206819bd98
commit e46f86c80b
64 changed files with 279 additions and 801 deletions
--- a/samples/sample_batch_reg.c
+++ b/samples/sample_batch_reg.c
@ -1,4 +1,9 @@
+<<<<<<< HEAD

+=======
+#include <stdio.h>
+#include <string.h>
+>>>>>>> unicorn-engine/msvc
 #include <unicorn/unicorn.h>
 #include <string.h>
 #include <stdio.h>