← Back to branch summary

~andreas-pokorny/mir/combine-modifier-state-accross-devices

~andreas-pokorny/mir/combine-modifier-state-accross-devices

Viewing all changes in revision 3023.

Committer: Andreas Pokorny
Date: 2015-10-26 14:12:43 UTC
mfrom: (3015.1.40 development-branch)
Revision ID: andreas.pokorny@canonical.com-20151026141243-9ijfaur340x0kjde

merge lp:mir

files added:
include/platform/mir/input/touchpad_settings.h

src/server/shell/surface_specification.cpp

files renamed:
tests/umock-acceptance-tests/test_client_cookie.cpp => tests/acceptance-tests/test_client_cookie.cpp

files modified:
CMakeLists.txt

debian/control

include/client/mir_toolkit/mir_input_device.h

include/common/mir/optional_value.h

include/platform/mir/input/input_device.h

include/server/mir/input/device.h

include/server/mir/shell/display_configuration_controller.h

include/server/mir/shell/surface_specification.h

include/test/mir/test/wait_condition.h

src/client/buffer_stream.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/android/android_input_receiver.h

src/include/server/mir/frontend/display_changer.h

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform_factory.cpp

src/platforms/mesa/server/kms/platform_symbols.cpp

src/platforms/mesa/server/x11/input/input_device.cpp

src/platforms/mesa/server/x11/input/input_device.h

src/platforms/mesa/server/x11/input/input_platform.cpp

src/server/compositor/multi_monitor_arbiter.cpp

src/server/compositor/multi_monitor_arbiter.h

src/server/compositor/stream.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_connection.cpp

src/server/frontend/unauthorized_display_changer.cpp

src/server/frontend/unauthorized_display_changer.h

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

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

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

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

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_client_screencast.cpp

tests/integration-tests/test_large_messages.cpp

tests/mir_test_doubles/mock_x11.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/umock-acceptance-tests/CMakeLists.txt

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_unauthorized_display_changer.cpp

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_x11_platform.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

Show diffs side-by-side

added added

removed removed

include/client/mir_toolkit/mir_input_device.h

include/common/mir/optional_value.h

include/platform/mir/input/input_device.h

include/platform/mir/input/touchpad_settings.h

include/server/mir/input/device.h

include/server/mir/shell/display_configuration_controller.h

include/server/mir/shell/surface_specification.h

include/test/mir/test/wait_condition.h

src/client/buffer_stream.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/android/android_input_receiver.h

src/include/server/mir/frontend/display_changer.h

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device.h

src/platforms/mesa/client/client_platform.cpp

src/platforms/mesa/client/client_platform_factory.cpp

src/platforms/mesa/server/kms/platform_symbols.cpp

src/platforms/mesa/server/x11/input/input_device.cpp

src/platforms/mesa/server/x11/input/input_device.h

src/platforms/mesa/server/x11/input/input_platform.cpp

src/server/compositor/multi_monitor_arbiter.cpp

src/server/compositor/multi_monitor_arbiter.h

src/server/compositor/stream.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_connection.cpp

src/server/frontend/unauthorized_display_changer.cpp

src/server/frontend/unauthorized_display_changer.h

src/server/scene/mediating_display_changer.cpp

src/server/scene/mediating_display_changer.h

src/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/surface_specification.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_cookie.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

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

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

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

tests/integration-tests/test_buffer_scheduling.cpp

tests/integration-tests/test_client_screencast.cpp

tests/integration-tests/test_large_messages.cpp

tests/mir_test_doubles/mock_x11.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/umock-acceptance-tests/CMakeLists.txt

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp

tests/unit-tests/compositor/test_stream.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_unauthorized_display_changer.cpp

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_x11_platform.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_mediating_display_changer.cpp

Older »