projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 20db2ff 60226af)
Merge branch 'tizen_qemu_2.0' into tizen
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 12 May 2014 06:11:35 +0000 (15:11 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 12 May 2014 06:11:35 +0000 (15:11 +0900)
commit2a322ccd1d10dfbc48c08dd4b6f6da2e0451cc0d
tree5f575b3d41af697afbe2eed6cba527b01558ac9atree | snapshot
parent20db2ff4d05bd563fbdcfc61bc4d7dc4064346becommit | diff
parent60226af4c94af357759275583b21a4afeadfadb6commit | diff
Merge branch 'tizen_qemu_2.0' into tizen

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
hw/9pfs/virtio-9p-device.c
hw/9pfs/virtio-9p-posix-acl.c
hw/9pfs/virtio-9p-xattr-user.c
hw/9pfs/virtio-9p-xattr.c
hw/9pfs/virtio-9p-xattr.h
hw/9pfs/virtio-9p.h
hw/virtio/virtio-pci.c
tizen/src/emulator.c
tizen/src/hw/maru_brill_codec.c
tizen/src/hw/maru_virtio_touchscreen.h
tizen/src/maru_sdl.c
15 files changed:
Makefile.objs diff1 | diff2 | blob | history
configure diff1 | diff2 | blob | history
hw/9pfs/cofile.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-device.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-local-maru.c diff1 | | blob | history
hw/9pfs/virtio-9p-posix-acl.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-xattr-user.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-xattr.c diff1 | diff2 | blob | history
hw/9pfs/virtio-9p-xattr.h diff1 | diff2 | blob | history
hw/9pfs/virtio-9p.h diff1 | diff2 | blob | history
tizen/src/Makefile diff1 | diff2 | blob | history
tizen/src/ecs/ecs.c diff1 | diff2 | blob | history
tizen/src/ecs/ecs_msg.c diff1 | diff2 | blob | history
tizen/src/ecs/ecs_tethering.c diff1 | diff2 | blob | history
tizen/src/hw/maru_virtio_touchscreen.h diff1 | diff2 | blob | history
Domain: SDK / Emulator;