Merge branch 'master' into msvc2

This commit is contained in:
Nguyen Anh Quynh
2017-04-21 01:17:00 +08:00
16 changed files with 54 additions and 19 deletions

View File

@ -9,8 +9,7 @@ public interface UnicornConst {
public static final int UC_VERSION_MAJOR = 1;
public static final int UC_VERSION_MINOR = 0;
public static final int UC_VERSION_EXTRA = 0;
public static final int UC_VERSION_EXTRA = 1;
public static final int UC_SECOND_SCALE = 1000000;
public static final int UC_MILISECOND_SCALE = 1000;
public static final int UC_ARCH_ARM = 1;