Nguyen Anh Quynh c01dcf0a14 fix merge conflicts

2017-03-10 21:04:33 +08:00

..

exec

merge msvc with master

2017-02-24 10:39:36 +08:00

fpu

platform.h move #3

2017-01-21 00:13:21 +11:00

hw

cleanup Sparc unused code

2017-01-23 12:34:00 +08:00

qapi

platform.h move #3

2017-01-21 00:13:21 +11:00

qemu

MSVC port (vardyh) (#746)

2017-02-07 21:31:35 +08:00

qom

platform.h move #3

2017-01-21 00:13:21 +11:00

sysemu

ffs() is redundant

2017-01-21 11:11:22 +08:00

config.h

import

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

elf.h

fix merge conflicts

2017-03-10 21:04:33 +08:00

glib_compat.h

platform.h move #3

2017-01-21 00:13:21 +11:00

qemu-common.h

fix conflicts

2017-01-21 11:06:05 +08:00