← Back to branch summary

~vanvugt/mir/compositor-test

~vanvugt/mir/compositor-test

Viewing all changes in revision 3493.

Committer: Daniel van Vugt
Date: 2016-05-04 01:49:04 UTC
mfrom: (3469.4.22 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20160504014904-9d9b4r3ct7cx2ld5

Merge latest trunk

files removed:
examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

files renamed:
src/include/server/mir/frontend/client_buffers.h => include/server/mir/frontend/client_buffers.h

files modified:
examples/CMakeLists.txt

examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

examples/server_example_window_management.cpp

examples/server_example_window_management_info.cpp

examples/server_example_window_management_info.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/frontend/session.h

include/server/mir/scene/buffer_stream_factory.h

include/server/mir/scene/session.h

include/test/mir/test/doubles/stub_session.h

src/platforms/mesa/server/x11/graphics/display_buffer.cpp

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/frontend/session_mediator.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/shell/canonical_window_manager.cpp

tests/include/mir/test/doubles/mock_buffer_stream.h

tests/include/mir/test/doubles/mock_scene_session.h

tests/include/mir/test/doubles/stub_buffer_stream.h

tests/include/mir/test/doubles/stub_buffer_stream_factory.h

tests/include/mir/test/doubles/stub_session.h

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/stub_session.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_session_manager.cpp

Show diffs side-by-side

added added

removed removed

examples/CMakeLists.txt

examples/render_surfaces.cpp

examples/server_example_canonical_window_manager.cpp

examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

examples/server_example_window_management.cpp

examples/server_example_window_management_info.cpp

examples/server_example_window_management_info.h

include/server/mir/frontend/buffer_stream.h

include/server/mir/frontend/session.h

include/server/mir/scene/buffer_stream_factory.h

include/server/mir/scene/session.h

include/test/mir/test/doubles/stub_session.h

src/platforms/mesa/server/x11/graphics/display_buffer.cpp

src/server/compositor/buffer_map.cpp

src/server/compositor/buffer_map.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/frontend/session_mediator.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/default_configuration.cpp

src/server/scene/session_manager.cpp

src/server/scene/session_manager.h

src/server/shell/canonical_window_manager.cpp

tests/include/mir/test/doubles/mock_buffer_stream.h

tests/include/mir/test/doubles/mock_scene_session.h

tests/include/mir/test/doubles/stub_buffer_stream.h

tests/include/mir/test/doubles/stub_buffer_stream_factory.h

tests/include/mir/test/doubles/stub_session.h

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_session.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/stub_session.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_client_buffers.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_session_manager.cpp

Older »