projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3912dd9 a965547)
Merge branch 'tizen-vigs-develop' into develop
authorStanislav Vorobiov <s.vorobiov@samsung.com>
Thu, 18 Jul 2013 09:04:26 +0000 (13:04 +0400)
committerStanislav Vorobiov <s.vorobiov@samsung.com>
Thu, 18 Jul 2013 09:04:26 +0000 (13:04 +0400)
commit18dc3d756e645ca442373ed109e14b5a65ec0231
treee1adcb185b3ee22927016429d88c36baa1866cc9tree | snapshot
parent3912dd96b0a8e1036400a93eeff6404a5405b1e0commit | diff
parenta9655479129ddc0bc61b130775709aed657c6354commit | diff
Merge branch 'tizen-vigs-develop' into develop

Conflicts:
configure
hw/Makefile.objs
hw/qdev-properties.c
hw/qdev.h
hw/virtio-balloon.c
hw/virtio-balloon.h
hw/virtio-blk.c
hw/virtio-blk.h
hw/virtio-net.c
hw/virtio-net.h
hw/virtio-pci.h
hw/virtio-serial-bus.c
hw/virtio-serial.h
hw/virtio/virtio-mmio.c
tizen/emulator_configure.sh
tizen/src/hw/maru_board.c
27 files changed:
Makefile.target diff1 | diff2 | blob | history
configure diff1 | diff2 | blob | history
hw/vigs_device.c | diff2 | blob | history
hw/vigs_device.h | diff2 | blob | history
hw/yagl_apis/egl/yagl_egl_api_ps.h diff1 | diff2 | blob | history
hw/yagl_apis/egl/yagl_egl_display.h diff1 | diff2 | blob | history
hw/yagl_apis/gles1/yagl_gles1_context.c | diff2 | blob | history
hw/yagl_compiled_transfer.c diff1 | diff2 | blob | history
hw/yagl_compiled_transfer.h diff1 | diff2 | blob | history
hw/yagl_device.c diff1 | diff2 | blob | history
hw/yagl_event.h diff1 | diff2 | blob | history
hw/yagl_marshal.h diff1 | diff2 | blob | history
hw/yagl_mem_transfer.c diff1 | diff2 | blob | history
hw/yagl_mem_transfer.h diff1 | diff2 | blob | history
hw/yagl_process.c diff1 | diff2 | blob | history
hw/yagl_process.h diff1 | diff2 | blob | history
hw/yagl_resource.h diff1 | diff2 | blob | history
hw/yagl_resource_list.h diff1 | diff2 | blob | history
hw/yagl_server.h diff1 | diff2 | blob | history
hw/yagl_thread.c diff1 | diff2 | blob | history
hw/yagl_thread.h diff1 | diff2 | blob | history
qemu-options.hx diff1 | diff2 | blob | history
tizen/emulator_configure.sh diff1 | diff2 | blob | history
tizen/src/Makefile.tizen diff1 | diff2 | blob | history
tizen/src/emulator.c diff1 | diff2 | blob | history
tizen/src/hw/maru_board.c diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
Domain: SDK / Emulator;