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

projects / sdk / emulator / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f3e9335 06d9298)

author	SeokYeon Hwang <syeon.hwang@samsung.com>
	Tue, 16 Jul 2013 04:57:40 +0000 (13:57 +0900)
committer	SeokYeon Hwang <syeon.hwang@samsung.com>
	Tue, 16 Jul 2013 04:57:40 +0000 (13:57 +0900)
commit	76753084b1178778a8dcfdad5898159022dbb875
tree	6d3b80beafb63f2617dbfe290d5d09ca99a66c8e	tree \| snapshot
parent	f3e9335d03e667363217192d3061b91f40478980	commit \| diff
parent	06d929839162272dd6717fd91f39061b946e270a	commit \| diff

Merge branch 'tizen_qemu_1.5.1' into develop

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
console.h
hw/ps2.c
input.c

.gitignore	diff1 \|	diff2 \|	blob \| history
tizen/src/Makefile	diff1 \|	diff2 \|	blob \| history
tizen/src/emulator.c	diff1 \|	diff2 \|	blob \| history
tizen/src/hw/maru_codec.c	diff1 \|	diff2 \|	blob \| history
tizen/src/skin/maruskin_server.c	diff1 \|	diff2 \|	blob \| history

Domain: SDK / Emulator;