← Back to branch summary

~vanvugt/mir/fix-1527449-Plugin

~vanvugt/mir/fix-1527449-Plugin

Viewing all changes in revision 3259.

Committer: Daniel van Vugt
Date: 2016-01-19 15:35:11 UTC
mfrom: (3205.6.30 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20160119153511-28svvcbxrehcah4x

Merge latest trunk

files added:
src/client/error_stream.cpp

src/client/error_stream.h

files removed:
src/client/default_client_buffer_stream_factory.cpp

src/client/default_client_buffer_stream_factory.h

files modified:
include/platform/mir/graphics/display.h

src/client/CMakeLists.txt

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/client_buffer_stream.h

src/client/connection_surface_map.h

src/client/mir_buffer_stream_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/surface_map.cpp

src/server/report/logging/compositor_report.cpp

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

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_connection_resource_map.cpp

tests/unit-tests/client/test_mir_connection.cpp

Show diffs side-by-side

added added

removed removed

include/platform/mir/graphics/display.h

src/client/CMakeLists.txt

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/client_buffer_stream.h

src/client/connection_surface_map.h

src/client/default_client_buffer_stream_factory.cpp

src/client/default_client_buffer_stream_factory.h

src/client/error_stream.cpp

src/client/error_stream.h

src/client/mir_buffer_stream_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/surface_map.cpp

src/server/report/logging/compositor_report.cpp

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

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_connection_resource_map.cpp

tests/unit-tests/client/test_mir_connection.cpp

Older »