review.tizen.org Git - sdk/emulator/qemu.git/commit

projects / sdk / emulator / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e4ad1ff b6a3050)

author	SeokYeon Hwang <syeon.hwang@samsung.com>
	Wed, 19 Aug 2015 07:32:14 +0000 (16:32 +0900)
committer	SeokYeon Hwang <syeon.hwang@samsung.com>
	Wed, 19 Aug 2015 08:07:24 +0000 (17:07 +0900)
commit	6b76b72ff106a3cb1c578054c2c09553325f8cf7
tree	003176e91d19360124e7b06f0504b5e07593a17a	tree \| snapshot
parent	e4ad1ff20d33d8d1fed8393873e6e7e11ba059bb	commit \| diff
parent	b6a30503fb36c4384ef5ea7c99cefc45b8f4860c	commit \| diff

Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Change-Id: I6753087cb299be5eb2b17c2ed256786021a4a27d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

12 files changed:

configure	diff1 \|	diff2 \|	blob \| history
package/changelog	diff1 \|	diff2 \|	blob \| history
package/pkginfo.manifest	diff1 \|	diff2 \|	blob \| history
tizen/emulator_configure.sh	diff1 \|	diff2 \|	blob \| history
tizen/src/Makefile	diff1 \|	diff2 \|	blob \| history
tizen/src/emul_state.c	diff1 \|	diff2 \|	blob \| history
tizen/src/emul_state.h	diff1 \|	diff2 \|	blob \| history
tizen/src/emulator.c	diff1 \|	diff2 \|	blob \| history
tizen/src/hw/virtio/maru_virtio_evdi.c	diff1 \|	diff2 \|	blob \| history
tizen/src/util/error_handler.c	diff1 \|	diff2 \|	blob \| history
ui/input.c	diff1 \|	diff2 \|	blob \| history
ui/spice-input.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;