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

projects / sdk / emulator / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 0e6e3e4) | patch

author	Evgeny Voevodin <e.voevodin@samsung.com>
	Mon, 25 Jun 2012 05:46:03 +0000 (09:46 +0400)
committer	Evgeny Voevodin <e.voevodin@samsung.com>
	Wed, 27 Jun 2012 10:44:32 +0000 (14:44 +0400)
commit	ca2ea4ae5701205908bb8d659b9fe6a7665fc561
tree	20fc42141e6fa3f705e753691c87f1d82c8285fb	tree \| snapshot
parent	0e6e3e4d48c948603c1a1a34de860847879cddf9	commit \| diff

Merge remote-tracking branch 'score/develop' into tizen-arm-v1.1.0

Conflicts:
hw/pc.c

Restored bios failure message.
It's generated in hw/pc_sysfw.c.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>

17 files changed:

blockdev.c		diff \| blob \| history
hw/pc.c		diff \| blob \| history
hw/pc_sysfw.c		diff \| blob \| history
package/pkginfo.manifest		diff \| blob \| history
tizen/src/VERSION		diff \| blob \| history
tizen/src/debug_ch.c		diff \| blob \| history
tizen/src/debug_ch.h		diff \| blob \| history
tizen/src/guest_server.c		diff \| blob \| history
tizen/src/hw/maru_codec.h		diff \| blob \| history
tizen/src/maru_err_table.c		diff \| blob \| history
tizen/src/maru_err_table.h		diff \| blob \| history
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java		diff \| blob \| history
tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java		diff \| blob \| history
tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java		diff \| blob \| history
tizen/src/skin/maruskin_client.c		diff \| blob \| history
tizen/src/skin/maruskin_operation.c	[changed mode: 0644->0755]	diff \| blob \| history
vl.c		diff \| blob \| history

Domain: SDK / Emulator;