← Back to branch summary

~ci-train-bot/mir/mir-ubuntu-yakkety-2783

~ci-train-bot/mir/mir-ubuntu-yakkety-2783

Viewing all changes in revision 1160.2866.10.

Committer: Brandon Schaefer
Date: 2017-01-18 16:58:17 UTC
mfrom: (1160.2470.355 development-branch)
mto: (1160.2868.2 mir)
mto: This revision was merged to the branch mainline in revision 1292.
Revision ID: brandon.schaefer@canonical.com-20170118165817-dp02km9zqo4r28o8

* Merge trunk fix conflict

files modified:
examples/fingerpaint.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/debug/surface.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/extensions/mesa_drm_auth.h

include/client/mir_toolkit/extensions/set_gbm_device.h

include/client/mir_toolkit/mir_blob.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_input_device.h

include/client/mir_toolkit/mir_surface.h

src/client/connection_surface_map.cpp

src/client/connection_surface_map.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/surface_map.h

src/client/symbols.map

src/include/client/mir_toolkit/mir_presentation_chain.h

src/include/client/mir_toolkit/mir_render_surface.h

src/platforms/mesa/client/client_platform.cpp

src/server/graphics/nested/host_surface.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/nested_display_configuration.cpp

src/utils/in.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_mirblob.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_presentation_chain.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

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

tests/test-clients/mir-stress/src/client.cpp

tests/test-clients/mir-stress/src/client.h

tests/unit-tests/input/test_nested_input_platform.cpp

tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp

tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp

Show diffs side-by-side

added added

removed removed

examples/fingerpaint.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/debug/surface.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/extensions/mesa_drm_auth.h

include/client/mir_toolkit/extensions/set_gbm_device.h

include/client/mir_toolkit/mir_blob.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_input_device.h

include/client/mir_toolkit/mir_surface.h

src/client/connection_surface_map.cpp

src/client/connection_surface_map.h

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_debug_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/surface_map.h

src/client/symbols.map

src/include/client/mir_toolkit/mir_presentation_chain.h

src/include/client/mir_toolkit/mir_render_surface.h

src/platforms/mesa/client/client_platform.cpp

src/server/graphics/nested/host_surface.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/nested_display_configuration.cpp

src/utils/in.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_library_callbacks.cpp

tests/acceptance-tests/test_client_with_custom_display_config_deadlock.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_mirblob.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_presentation_chain.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

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

tests/test-clients/mir-stress/src/client.cpp

tests/test-clients/mir-stress/src/client.h

tests/unit-tests/input/test_nested_input_platform.cpp

tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp

tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp

tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp

tests/unit-tests/platforms/nested/test_nested_display_configuration.cpp

Older »