← Back to branch summary

~vanvugt/mir/radial.zoom

~vanvugt/mir/radial.zoom

Viewing all changes in revision 1539.

Committer: Daniel van Vugt
Date: 2014-04-17 03:36:37 UTC
mfrom: (1493.19.39 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140417033637-5ekg9ax5g200uwem

Merge latest development-branch and fix conflicts from last night's landings

files added:
include/server/mir/compositor/gl_program.h

src/server/compositor/gl_program.cpp

tests/integration-tests/test_surface_stack_with_compositor.cpp

files modified:
include/server/mir/compositor/gl_renderer.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_process_manager.h

src/server/compositor/CMakeLists.txt

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/frontend/published_socket_connector.cpp

tests/acceptance-tests/test_server_startup.cpp

tests/integration-tests/CMakeLists.txt

tests/mir_test_framework/display_server_test_fixture.cpp

tests/mir_test_framework/process.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/compositor/gl_program.h

include/server/mir/compositor/gl_renderer.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_framework/display_server_test_fixture.h

include/test/mir_test_framework/testing_process_manager.h

src/server/compositor/CMakeLists.txt

src/server/compositor/gl_program.cpp

src/server/compositor/gl_renderer.cpp

src/server/compositor/gl_renderer_factory.cpp

src/server/compositor/gl_renderer_factory.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/frontend/published_socket_connector.cpp

tests/acceptance-tests/test_server_startup.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/test_surface_stack_with_compositor.cpp

tests/mir_test_framework/display_server_test_fixture.cpp

tests/mir_test_framework/process.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

Older »