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

projects / sdk / emulator / qemu.git / commit

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

author	Evgeny Voevodin <e.voevodin@samsung.com>
	Mon, 17 Sep 2012 05:26:04 +0000 (09:26 +0400)
committer	Evgeny Voevodin <e.voevodin@samsung.com>
	Tue, 18 Sep 2012 06:18:48 +0000 (10:18 +0400)
commit	c17bc667c6d98922ef0e29282d3f8ca262f14efd
tree	64d162ebaceaa1b07fa9e61453de20a9a216edc9	tree \| snapshot
parent	d3a180dc6e5721c38340a371c31d358fd5149f59	commit \| diff

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

Conflicts:
vl.c

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

16 files changed:

package/pkginfo.manifest		diff \| blob \| history
tizen/src/VERSION		diff \| blob \| history
tizen/src/hw/gloffscreen.h		diff \| blob \| history
tizen/src/hw/gloffscreen_glx.c		diff \| blob \| history
tizen/src/hw/gloffscreen_wgl.c		diff \| blob \| history
tizen/src/hw/gloffscreen_xcomposite.c		diff \| blob \| history
tizen/src/hw/maru_camera_common.h		diff \| blob \| history
tizen/src/hw/maru_camera_linux_pci.c		diff \| blob \| history
tizen/src/hw/maru_camera_win32_pci.c		diff \| blob \| history
tizen/src/hw/maru_device_ids.h		diff \| blob \| history
tizen/src/hw/opengl_exec.c		diff \| blob \| history
tizen/src/maru_shm.c		diff \| blob \| history
tizen/src/skin/client/build.xml		diff \| blob \| history
tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java		diff \| blob \| history
tizen/src/skin/maruskin_operation.c		diff \| blob \| history
vl.c		diff \| blob \| history

Domain: SDK / Emulator;