projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 96d2ac1 d00e6cd)
Merge 'v2.2.0' into tizen_next_qemu_2.2
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 10 Dec 2014 05:48:31 +0000 (14:48 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 10 Dec 2014 05:53:58 +0000 (14:53 +0900)
commitec77d208f0cc6de712c9b0b1345726a7258e57a1
treedf8e4db1190ed8ebaedd408ca7a55e4165106b44tree | snapshot
parent96d2ac1f7274a69ec439581b75152bf9a4efd3a2commit | diff
parentd00e6cddc220de993573dfb5fd160ac72ccd49abcommit | diff
Merge 'v2.2.0' into tizen_next_qemu_2.2

v2.2.0 release

Conflicts:
blockdev.c
configure
cpu-exec.c
exec.c
hw/Makefile.objs
hw/i386/pc_piix.c
qom/object.c
target-i386/translate.c
util/oslib-posix.c
util/oslib-win32.c
vl.c
xen-hvm.c

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Change-Id: I0f708eddfb51b98b9a7453e6e92f20c90a8b5aaf
57 files changed:
.gitignore diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
Makefile.objs diff1 | diff2 | blob | history
Makefile.target diff1 | diff2 | blob | history
accel.c | diff2 | blob | history
arch_init.c diff1 | diff2 | blob | history
audio/audio.c diff1 | diff2 | blob | history
block.c diff1 | diff2 | blob | history
block/raw-win32.c diff1 | diff2 | blob | history
blockdev.c diff1 | diff2 | blob | history
configure diff1 | diff2 | blob | history
cpu-exec.c diff1 | diff2 | blob | history
cpus.c diff1 | diff2 | blob | history
exec.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-device.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-maru.c diff1 | | blob | history
hw/Makefile.objs diff1 | diff2 | blob | history
hw/acpi/ich9.c diff1 | diff2 | blob | history
hw/acpi/piix4.c diff1 | diff2 | blob | history
hw/i386/pc.c diff1 | diff2 | blob | history
hw/i386/pc_piix.c diff1 | diff2 | blob | history
hw/i386/pc_sysfw.c diff1 | diff2 | blob | history
hw/input/ps2.c diff1 | diff2 | blob | history
hw/intc/apic_common.c diff1 | diff2 | blob | history
hw/pci/pci.c diff1 | diff2 | blob | history
hw/vigs/vigs_device.c diff1 | | blob | history
hw/yagl/yagl_device.c diff1 | | blob | history
include/hw/i386/pc.h diff1 | diff2 | blob | history
include/qemu-common.h diff1 | diff2 | blob | history
include/qom/cpu.h diff1 | diff2 | blob | history
include/sysemu/arch_init.h diff1 | diff2 | blob | history
include/sysemu/sysemu.h diff1 | diff2 | blob | history
include/ui/console.h diff1 | diff2 | blob | history
main-loop.c diff1 | diff2 | blob | history
os-win32.c diff1 | diff2 | blob | history
qapi-schema.json diff1 | diff2 | blob | history
qemu-char.c diff1 | diff2 | blob | history
qemu-options.hx diff1 | diff2 | blob | history
qemu-timer.c diff1 | diff2 | blob | history
target-i386/hax-all.c diff1 | | blob | history
target-i386/translate.c diff1 | diff2 | blob | history
tcg/tcg.c diff1 | diff2 | blob | history
tizen/src/display/maru_sdl.c diff1 | | blob | history
tizen/src/ecs/ecs.c diff1 | | blob | history
tizen/src/hw/maru_board.c diff1 | | blob | history
tizen/src/hw/pci/maru_brightness.c diff1 | | blob | history
tizen/src/hw/pci/maru_brillcodec_device.c diff1 | | blob | history
tizen/src/hw/pci/maru_camera_common_pci.c diff1 | | blob | history
ui/console.c diff1 | diff2 | blob | history
ui/input.c diff1 | diff2 | blob | history
ui/sdl.c diff1 | diff2 | blob | history
ui/spice-core.c diff1 | diff2 | blob | history
ui/spice-display.c diff1 | diff2 | blob | history
util/oslib-posix.c diff1 | diff2 | blob | history
util/oslib-win32.c diff1 | diff2 | blob | history
util/qemu-sockets.c diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
Domain: SDK / Emulator;