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

projects / sdk / emulator / qemu.git / commit

author	Stanislav Vorobiov <s.vorobiov@samsung.com>
	Wed, 15 Jan 2014 07:05:46 +0000 (11:05 +0400)
committer	Stanislav Vorobiov <s.vorobiov@samsung.com>
	Wed, 15 Jan 2014 08:07:39 +0000 (12:07 +0400)
commit	193ba8206fa6300d3c1070979743219017a67276
tree	692cded9c6de30383f0de4a47076089e0429feda	tree \| snapshot
parent	a5489c18ac7dbe8a98ea63d2523b7aa6506cb810	commit \| diff
parent	38b01d6d44d931d6dc4d930da8918225dfddce60	commit \| diff

Merge remote-tracking branch 'origin/tizen' into glesv3

Conflicts:
hw/vigs/vigs_gl_backend_glx.c
hw/yagl/yagl_apis/gles/yagl_gles_calls.c
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c
hw/yagl/yagl_inc/GLES/egl.h
hw/yagl/yagl_inc/GLES/gl.h
hw/yagl/yagl_inc/GLES/glext.h
hw/yagl/yagl_inc/GLES/glplatform.h
hw/yagl/yagl_inc/GLES2/gl2.h
hw/yagl/yagl_inc/GLES2/gl2ext.h
hw/yagl/yagl_inc/GLES2/gl2platform.h
hw/yagl_apis/gles/yagl_gles_api_ts.c
hw/yagl_apis/gles/yagl_gles_api_ts.h
hw/yagl_drivers/gles_ogl/yagl_gles_ogl.h
hw/yagl_egl_backend.c
hw/yagl_egl_driver.c
hw/yagl_egl_interface.h
hw/yagl_gles_driver.c
hw/yagl_transport.c
hw/yagl_transport.h
hw/yagl_types.h
hw/yagl_version.h

Change-Id: Icc72fbe2ff253ae282d3f2972e216b1fc42c1b02

38 files changed:

hw/vigs/vigs_gl_backend_glx.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/egl/yagl_egl_config.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_gles_api_ts.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_gles_calls.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_host_gles_calls.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_device.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_backend.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_backend.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_driver.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_driver.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_interface.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_gles_driver.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_gles_driver.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_inc/EGL/eglext.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_inc/EGL/eglmesaext.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_inc/EGL/eglplatform.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_inc/KHR/khrplatform.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_log.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_server.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_server.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_transport.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_transport.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_types.h	\|	diff2 \|	blob \| history

Domain: SDK / Emulator;

RSS Atom

hw/vigs/vigs_gl_backend_glx.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/egl/yagl_egl_config.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/egl/yagl_host_egl_calls.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_gles_api_ts.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_gles_api_ts.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_gles_calls.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_host_gles_calls.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_apis/gles/yagl_host_gles_calls.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_context.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_offscreen/yagl_egl_offscreen_display.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_context.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_backends/egl_onscreen/yagl_egl_onscreen_surface.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_device.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/egl_glx/yagl_egl_glx.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/gles_ogl/yagl_gles_ogl.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_drivers/gles_onscreen/yagl_gles_onscreen.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_backend.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_backend.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_driver.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_driver.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_egl_interface.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_gles_driver.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_gles_driver.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_inc/EGL/eglext.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_inc/EGL/eglmesaext.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_inc/EGL/eglplatform.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_inc/KHR/khrplatform.h	diff1 \|	diff2 \|	blob \| history
hw/yagl/yagl_log.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_server.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_server.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_transport.c	\|	diff2 \|	blob \| history
hw/yagl/yagl_transport.h	\|	diff2 \|	blob \| history
hw/yagl/yagl_types.h	\|	diff2 \|	blob \| history