← Back to branch summary

~alan-griffiths/mir/verify-smoke-test-runs-ok

~alan-griffiths/mir/verify-smoke-test-runs-ok

Viewing all changes in revision 3361.2.13.

Committer: Daniel van Vugt
Date: 2016-03-14 10:13:49 UTC
mfrom: (3385 development-branch)
mto: This revision was merged to the branch mainline in revision 3398.
Revision ID: daniel.van.vugt@canonical.com-20160314101349-olm4fbs915d60nfo

Merge latest trunk

files added:
debian/mir-android-diagnostics.install

src/client/mir_input_device_api.cpp

src/client/protobuf_to_native_buffer.cpp

src/client/protobuf_to_native_buffer.h

src/utils/in.cpp

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/throwback/test_presentation_chain.cpp

tools/abi-check-mircommon-skip-symbols

files removed:
tools/abi-check-mirclient-skip-symbols

tools/generate-abi-base-dump.sh

files renamed:
tests/integration-tests/graphics/android/ => src/platforms/android/utils/

src/server/frontend/unauthorized_display_changer.cpp => src/server/frontend/authorizing_display_changer.cpp

src/server/frontend/unauthorized_display_changer.h => src/server/frontend/authorizing_display_changer.h

tests/unit-tests/frontend/test_unauthorized_display_changer.cpp => tests/unit-tests/frontend/test_authorizing_display_changer.cpp

tools/run_abi_compliance_checker.sh => tools/abi_check.sh

files modified:
cmake/ABICheck.cmake

debian/control

debian/mir-utils.install

doc/abi_compatibility_tools.md

doc/android_new_device_bringup.md

examples/client_helpers.h

examples/flicker.c

examples/server_example_window_management.cpp

examples/xcursor_loader.cpp

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/input/input_event.h

include/client/mir_toolkit/mir_client_library.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_display_configuration.h

include/client/mir_toolkit/mir_input_device.h

include/server/mir/input/input_device_hub.h

include/server/mir/input/input_manager.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/mock_input_device_hub.h

include/test/mir_test_framework/fake_input_device.h

src/client/CMakeLists.txt

src/client/buffer.cpp

src/client/buffer.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/default_connection_configuration.cpp

src/client/display_configuration.cpp

src/client/display_configuration.h

src/client/display_configuration_api.cpp

src/client/input/input_devices.cpp

src/client/mir_buffer_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/presentation_chain.cpp

src/client/screencast_stream.cpp

src/client/symbols.map

src/include/client/mir/input/input_devices.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/server/mir/input/input_probe.h

src/platforms/android/CMakeLists.txt

src/platforms/android/utils/CMakeLists.txt

src/platforms/android/utils/android_graphics_region_factory.cpp

src/platforms/android/utils/test_android_hardware_sanity.cpp

src/protobuf/mir_protobuf.proto

src/server/frontend/CMakeLists.txt

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/session_mediator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/input/input_probe.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/utils/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

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

tests/integration-tests/CMakeLists.txt

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/fake_alarm_factory.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/mir_test_framework/stub_input_platform.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_mir_buffer.cpp

tests/unit-tests/client/test_presentation_chain.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_default_input_manager.cpp

tests/unit-tests/input/test_input_platform_probing.cpp

tools/lib_descriptor.xml.skel

Show diffs side-by-side

added added

removed removed

cmake/ABICheck.cmake

debian/mir-android-diagnostics.install

debian/mir-utils.install

doc/abi_compatibility_tools.md

doc/android_new_device_bringup.md

examples/client_helpers.h

examples/flicker.c

examples/server_example_window_management.cpp

examples/xcursor_loader.cpp

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/input/input_event.h

include/client/mir_toolkit/mir_client_library.h

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_display_configuration.h

include/client/mir_toolkit/mir_input_device.h

include/server/mir/input/input_device_hub.h

include/server/mir/input/input_manager.h

include/test/mir/test/display_config_matchers.h

include/test/mir/test/doubles/mock_input_device_hub.h

include/test/mir_test_framework/fake_input_device.h

src/client/CMakeLists.txt

src/client/buffer.cpp

src/client/buffer.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/default_connection_configuration.cpp

src/client/display_configuration.cpp

src/client/display_configuration.h

src/client/display_configuration_api.cpp

src/client/input/input_devices.cpp

src/client/mir_buffer_api.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_input_device_api.cpp

src/client/presentation_chain.cpp

src/client/protobuf_to_native_buffer.cpp

src/client/protobuf_to_native_buffer.h

src/client/screencast_stream.cpp

src/client/symbols.map

src/include/client/mir/input/input_devices.h

src/include/client/mir_toolkit/mir_buffer.h

src/include/server/mir/input/input_probe.h

src/platforms/android/CMakeLists.txt

src/platforms/android/utils/CMakeLists.txt

src/platforms/android/utils/android_graphics_region_factory.cpp

src/platforms/android/utils/test_android_hardware_sanity.cpp

src/protobuf/mir_protobuf.proto

src/server/frontend/CMakeLists.txt

src/server/frontend/authorizing_display_changer.cpp

src/server/frontend/authorizing_display_changer.h

src/server/frontend/default_ipc_factory.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/session_mediator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/input/input_probe.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/utils/CMakeLists.txt

src/utils/in.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/test_new_display_configuration.cpp

tests/acceptance-tests/test_prompt_session_client_api.cpp

tests/acceptance-tests/throwback/CMakeLists.txt

tests/acceptance-tests/throwback/test_presentation_chain.cpp

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

tests/integration-tests/CMakeLists.txt

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/fake_alarm_factory.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/mir_test_framework/stub_input_platform.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/client/test_mir_buffer.cpp

tests/unit-tests/client/test_presentation_chain.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_authorizing_display_changer.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/input/test_default_input_manager.cpp

tests/unit-tests/input/test_input_platform_probing.cpp

tools/abi-check-mirclient-skip-symbols

tools/abi-check-mircommon-skip-symbols

tools/abi_check.sh

tools/generate-abi-base-dump.sh

tools/lib_descriptor.xml.skel

Older »