← Back to branch summary

~mir-team/mir/chain-simplification

~mir-team/mir/chain-simplification

Viewing all changes in revision 3675.1.26.

Committer: Daniel van Vugt
Date: 2016-09-28 02:56:20 UTC
mfrom: (3723 development-branch)
mto: This revision was merged to the branch mainline in revision 3758.
Revision ID: daniel.van.vugt@canonical.com-20160928025620-j9m1bju1z7wpbwck

Merge latest trunk

files removed:
src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

files modified:
src/client/buffer_vault.cpp

src/client/mir_connection.cpp

src/client/surface_map.cpp

src/platform/options/default_configuration.cpp

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/compositor/multi_monitor_arbiter.cpp

src/server/compositor/multi_monitor_arbiter.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/shell/abstract_shell.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/throwback/test_presentation_chain.cpp

tests/integration-tests/compositor/CMakeLists.txt

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tools/process_doxygen_xml.py

Show diffs side-by-side

added added

removed removed

src/client/buffer_vault.cpp

src/client/mir_connection.cpp

src/client/surface_map.cpp

src/platform/options/default_configuration.cpp

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_factory.h

src/server/compositor/default_configuration.cpp

src/server/compositor/multi_monitor_arbiter.cpp

src/server/compositor/multi_monitor_arbiter.h

src/server/compositor/stream.cpp

src/server/compositor/stream.h

src/server/shell/abstract_shell.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/throwback/test_presentation_chain.cpp

tests/integration-tests/compositor/CMakeLists.txt

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

tests/integration-tests/surface_composition.cpp

tests/integration-tests/test_buffer_scheduling.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tools/process_doxygen_xml.py

Older »