projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c9b564 bd3025a)
Merge branch 'tizen-arm' into develop
authorsyeon.hwang <syeon.hwang@samsung.com>
Tue, 30 Oct 2012 04:35:00 +0000 (13:35 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Tue, 30 Oct 2012 04:35:00 +0000 (13:35 +0900)
commit60574ac4e9943768cb9812d95c90aa81666bcc3f
tree2870e3e955278d313c1b03d9da1272cbe961eb55tree | snapshot
parent8c9b56440b8da6a714d63a3df559f710c49e15bccommit | diff
parentbd3025afa216f149763239082dcfaa3023daad08commit | diff
Merge branch 'tizen-arm' into develop

Conflicts:
hw/virtio-pci.c
tizen/emulator_configure.sh
tizen/src/Makefile.tizen
tizen/src/emulator.c
tizen/src/hw/maru_board.c
tizen/src/hw/maru_vga.c
tizen/src/skin/client/skins/emul-320x480/default.dbi
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
vl.c
12 files changed:
hw/pci-hotplug.c diff1 | diff2 | blob | history
hw/virtio-pci.c diff1 | diff2 | blob | history
input.c diff1 | diff2 | blob | history
tizen/src/Makefile diff1 | diff2 | blob | history
tizen/src/Makefile.tizen diff1 | diff2 | blob | history
tizen/src/emulator.h diff1 | diff2 | blob | history
tizen/src/hw/maru_board.c diff1 | diff2 | blob | history
tizen/src/hw/maru_vga.c diff1 | diff2 | blob | history
tizen/src/mloop_event.c diff1 | diff2 | blob | history
tizen/src/skin/maruskin_operation.c diff1 | diff2 | blob | history
tizen/src/skin/maruskin_server.c diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
Domain: SDK / Emulator;