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

projects / sdk / emulator / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d8f37f b1050aa)

author	SeokYeon Hwang <syeon.hwang@samsung.com>
	Wed, 9 Sep 2015 06:04:25 +0000 (15:04 +0900)
committer	SeokYeon Hwang <syeon.hwang@samsung.com>
	Wed, 9 Sep 2015 07:59:45 +0000 (16:59 +0900)
commit	ed04216f56ca5c7b6b89a0b3d8a487f84d904c9b
tree	dc3240cceb2abfa16393f217d4b890398692fdb7	tree \| snapshot
parent	1d8f37f3b39747085f7b091fbdaf3f827ce284d2	commit \| diff
parent	b1050aa3a33cd319ac2cfd50562bc5080d556bc8	commit \| diff

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

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

.gitignore	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
package/build.common	\|	diff2 \|	blob \| history
tizen/emulator_configure.sh	diff1 \|	diff2 \|	blob \| history
tizen/src/ecs/ecs_msg_injector.c	diff1 \|	diff2 \|	blob \| history
tizen/src/emul_state.c	diff1 \|	diff2 \|	blob \| history
tizen/src/emulator.c	diff1 \|	diff2 \|	blob \| history
util/oslib-win32.c	diff1 \|	diff2 \|	blob \| history
util/qemu-error.c	diff1 \|	diff2 \|	blob \| history
vl.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;