Nguyen Anh Quynh 20b01a6933 fix merge conflict

2016-02-01 12:08:38 +08:00

..

aes.c

import

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

bitmap.c

import

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

bitops.c

import

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

crc32c.c

import

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

cutils.c

import

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

error.c

do not abort() when memory is insufficient. this fixes issue #244

2015-11-10 11:44:29 +08:00

getauxval.c

Add getauxval.c back

2016-01-18 12:47:32 +01:00

host-utils.c

import

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

Makefile.objs

Finish adding getauxval

2016-01-18 12:48:49 +01:00

module.c

import

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

oslib-posix.c

Build for Cygwin

2015-12-20 22:00:35 +09:00

oslib-win32.c

import

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

qemu-error.c

import

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

qemu-option.c

import

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

qemu-thread-posix.c

fix merge conflict

2016-02-01 12:08:38 +08:00

qemu-thread-win32.c

Fix memory leaks as reported by DrMemory and Valgrind.

2016-01-08 01:42:56 +02:00

qemu-timer-common.c

import

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

unicode.c

import

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