Merge commit '260bf01' into tizen-arm
authorEvgeny Voevodin <e.voevodin@samsung.com>
Fri, 14 Sep 2012 07:45:10 +0000 (11:45 +0400)
committerEvgeny Voevodin <e.voevodin@samsung.com>
Fri, 14 Sep 2012 07:45:53 +0000 (11:45 +0400)
commitee93774f737de94b92bd9fe32f0d49c56d10b8e6
tree5a6e88f9ecc0d9586da12b5f027f039338267aef
parent6c4ce4b6ad8f42edcace4ce4185faf9aa8b16f01
parent260bf0141adf0ad5e3aea14c2012131092d32031
Merge commit '260bf01' into tizen-arm
38 files changed:
hw/9pfs/virtio-9p-handle.c
hw/acpi_piix4.c
hw/usb/dev-storage.c
hw/vga-pci.c
hw/virtio-pci.c
hw/virtio.h
input.c
oslib-win32.c
qemu-char.c
target-i386/hax-all.c
tizen/src/Makefile
tizen/src/Makefile.tizen
tizen/src/emulator.c
tizen/src/emulator.h
tizen/src/hw/gloffscreen_common.c
tizen/src/hw/gloffscreen_glx.c
tizen/src/hw/gloffscreen_test.c
tizen/src/hw/gloffscreen_wgl.c
tizen/src/hw/gloffscreen_xcomposite.c
tizen/src/hw/maru_arm_board.c
tizen/src/hw/maru_board.c
tizen/src/hw/maru_brightness.c
tizen/src/hw/maru_camera_common.h
tizen/src/hw/maru_camera_common_pci.c
tizen/src/hw/maru_camera_linux_pci.c
tizen/src/hw/maru_codec.c
tizen/src/hw/maru_overlay.c
tizen/src/hw/maru_usb_touchscreen.c
tizen/src/hw/maru_usb_touchscreen.h
tizen/src/maru_sdl.c
tizen/src/sdb.c
tizen/src/sdb.h
tizen/src/skin/client/skins/emul-320x480/default.dbi
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
tizen/src/skin/maruskin_operation.c
tizen/src/skin/maruskin_server.c
ui/sdl.c
vl.c