← Back to branch summary

~alan-griffiths/mir/fix-1463873

~alan-griffiths/mir/fix-1463873

Viewing all changes in revision 3106.

Committer: Alan Griffiths
Date: 2015-11-19 10:29:38 UTC
mfrom: (3103.2.5 development-branch)
Revision ID: alan@octopull.co.uk-20151119102938-uewx11ffjhrn68gk

merge lp:mir

files added:
include/server/mir/input/pointer_configuration.h

include/server/mir/input/touchpad_configuration.h

tests/unit-tests/input/test_default_device.cpp

files renamed:
debian/libmirserver35.install => debian/libmirserver36.install

src/server/input/device_handle.h => src/server/input/default_device.h

files modified:
3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp

debian/changelog

debian/control

include/server/mir/input/device.h

src/common/logging/input_timestamp.cpp

src/platforms/evdev/libinput_ptr.cpp

src/server/CMakeLists.txt

src/server/input/CMakeLists.txt

src/server/input/default_device.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/key_repeat_dispatcher.cpp

src/server/report/logging/shell_report.cpp

src/server/symbols.map

tests/mir_test_framework/fake_input_device_impl.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/test_default_input_device_hub.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp

debian/changelog

debian/libmirserver36.install

include/server/mir/input/device.h

include/server/mir/input/pointer_configuration.h

include/server/mir/input/touchpad_configuration.h

src/common/logging/input_timestamp.cpp

src/platforms/evdev/libinput_ptr.cpp

src/server/CMakeLists.txt

src/server/input/CMakeLists.txt

src/server/input/default_device.cpp

src/server/input/default_device.h

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/key_repeat_dispatcher.cpp

src/server/report/logging/shell_report.cpp

src/server/symbols.map

tests/mir_test_framework/fake_input_device_impl.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/test_default_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

Older »