← Back to branch summary

~vanvugt/mir/fix-1527449-Plugin

~vanvugt/mir/fix-1527449-Plugin

Viewing all changes in revision 3264.

Committer: Daniel van Vugt
Date: 2016-01-20 15:59:43 UTC
mfrom: (3205.6.35 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20160120155943-jfbf7ylzpr97h146

Merge latest trunk and fix a conflict.

files renamed:
src/include/server/mir/compositor/compositor_report.h => include/server/mir/compositor/compositor_report.h

files modified:
examples/server_example_adorning_compositor.cpp

examples/server_example_adorning_compositor.h

examples/server_example_custom_compositor.cpp

include/server/mir/server.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/platforms/android/server/display.cpp

src/server/server.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

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

Show diffs side-by-side

added added

removed removed

examples/server_example_adorning_compositor.cpp

examples/server_example_adorning_compositor.h

examples/server_example_custom_compositor.cpp

include/server/mir/server.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/platforms/android/server/display.cpp

src/server/server.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

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

Older »