← Back to branch summary

~kdub/+junk/nbs-integration

~kdub/+junk/nbs-integration

Viewing all changes in revision 3044.

Committer: Kevin DuBois
Date: 2015-10-20 13:33:34 UTC
mfrom: (3036.2.5 development-branch)
Revision ID: kevin.dubois@canonical.com-20151020133334-msvr5ymj6vo52zbo

merge in mir

files added:
include/client/mir_toolkit/mir_input_device.h

include/platform/mir/input/pointer_settings.h

src/server/shell/surface_specification.cpp

files modified:
include/common/mir/optional_value.h

include/platform/mir/input/input_device.h

include/server/mir/shell/surface_specification.h

src/platforms/evdev/input_modifier_utils.cpp

src/platforms/evdev/input_modifier_utils.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/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

tests/include/mir/test/gmock_fixes.h

tests/integration-tests/test_buffer_scheduling.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

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

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/scene/test_abstract_shell.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/pointer_settings.h

include/server/mir/shell/surface_specification.h

src/platforms/evdev/input_modifier_utils.cpp

src/platforms/evdev/input_modifier_utils.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/server/shell/CMakeLists.txt

src/server/shell/abstract_shell.cpp

src/server/shell/surface_specification.cpp

tests/include/mir/test/gmock_fixes.h

tests/integration-tests/test_buffer_scheduling.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

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

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

Older »