Chris Eagle 592cbc6eaf conflict resolution with merge master

2015-08-28 23:51:56 -07:00

..

arm64.h

renames the register constants so unicorn and capstone can compile together

2015-08-23 21:36:33 -07:00

arm.h

renames the register constants so unicorn and capstone can compile together

2015-08-23 21:36:33 -07:00

m68k.h

renamed m68k enum constants

2015-08-23 21:56:24 -07:00

mips.h

renames the register constants so unicorn and capstone can compile together

2015-08-23 21:36:33 -07:00

platform.h

import

2015-08-21 15:04:50 +08:00

sparc.h

renames the register constants so unicorn and capstone can compile together

2015-08-23 21:36:33 -07:00

unicorn.h

conflict resolution with merge master

2015-08-28 23:51:56 -07:00

x86.h

x86: add back 2 registers X86_REG_FCW & X86_REG_FPIP

2015-08-24 13:58:52 +08:00