← Back to branch summary

~albaguirre/mir/add-menu-api

~albaguirre/mir/add-menu-api

Viewing all changes in revision 2160.

Committer: Alberto Aguirre
Date: 2015-01-09 16:00:42 UTC
mfrom: (2141.1.69 development-branch)
Revision ID: alberto.aguirre@canonical.com-20150109160042-6o47tom3sg5of5v1

merge lp:mir

files added:
src/include/server/mir/compositor/gl_program_family.h

src/server/compositor/gl_program_family.cpp

files modified:
debian/changelog

debian/control

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_compositor.h

playground/demo-shell/demo_renderer.cpp

playground/demo-shell/demo_renderer.h

playground/demo-shell/demo_shell.cpp

src/include/server/mir/compositor/gl_renderer.h

src/platforms/android/display.cpp

src/platforms/android/display.h

src/platforms/android/display_buffer.cpp

src/platforms/android/display_buffer_builder.h

src/platforms/android/display_device.h

src/platforms/android/fb_device.cpp

src/platforms/android/fb_device.h

src/platforms/android/framebuffers.cpp

src/platforms/android/framebuffers.h

src/platforms/android/hwc_blanking_control.cpp

src/platforms/android/hwc_common_device.cpp

src/platforms/android/hwc_common_device.h

src/platforms/android/hwc_configuration.h

src/platforms/android/hwc_device.cpp

src/platforms/android/hwc_device.h

src/platforms/android/hwc_fb_device.cpp

src/platforms/android/hwc_fb_device.h

src/platforms/android/output_builder.cpp

src/platforms/android/output_builder.h

src/platforms/android/resource_factory.cpp

src/server/compositor/CMakeLists.txt

src/server/compositor/default_configuration.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/input/android/android_input_registrar.cpp

src/server/input/android/android_input_target_enumerator.cpp

src/server/symbols.map

tests/acceptance-tests/throwback/test_client_input.cpp

tests/include/mir_test_doubles/mock_display_device.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/examples/test_demo_renderer.cpp

tests/unit-tests/graphics/android/test_display.cpp

tests/unit-tests/graphics/android/test_display_buffer.cpp

tests/unit-tests/graphics/android/test_fb_device.cpp

tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_configuration.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_fb_device.cpp

tests/unit-tests/graphics/test_program_factory.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

playground/demo-shell/demo_compositor.cpp

playground/demo-shell/demo_compositor.h

playground/demo-shell/demo_renderer.cpp

playground/demo-shell/demo_renderer.h

playground/demo-shell/demo_shell.cpp

src/include/server/mir/compositor/gl_program_family.h

src/include/server/mir/compositor/gl_renderer.h

src/platforms/android/display.cpp

src/platforms/android/display.h

src/platforms/android/display_buffer.cpp

src/platforms/android/display_buffer_builder.h

src/platforms/android/display_device.h

src/platforms/android/fb_device.cpp

src/platforms/android/fb_device.h

src/platforms/android/framebuffers.cpp

src/platforms/android/framebuffers.h

src/platforms/android/hwc_blanking_control.cpp

src/platforms/android/hwc_common_device.cpp

src/platforms/android/hwc_common_device.h

src/platforms/android/hwc_configuration.h

src/platforms/android/hwc_device.cpp

src/platforms/android/hwc_device.h

src/platforms/android/hwc_fb_device.cpp

src/platforms/android/hwc_fb_device.h

src/platforms/android/output_builder.cpp

src/platforms/android/output_builder.h

src/platforms/android/resource_factory.cpp

src/server/compositor/CMakeLists.txt

src/server/compositor/default_configuration.cpp

src/server/compositor/gl_program_family.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/input/android/android_input_registrar.cpp

src/server/input/android/android_input_target_enumerator.cpp

src/server/symbols.map

tests/acceptance-tests/throwback/test_client_input.cpp

tests/include/mir_test_doubles/mock_display_device.h

tests/include/mir_test_doubles/stub_display_builder.h

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/examples/test_demo_compositor.cpp

tests/unit-tests/examples/test_demo_renderer.cpp

tests/unit-tests/graphics/android/test_display.cpp

tests/unit-tests/graphics/android/test_display_buffer.cpp

tests/unit-tests/graphics/android/test_fb_device.cpp

tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp

tests/unit-tests/graphics/android/test_hwc_common_device.cpp

tests/unit-tests/graphics/android/test_hwc_configuration.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_fb_device.cpp

tests/unit-tests/graphics/test_program_factory.cpp

Older »