← Back to branch summary

~vanvugt/mir/earlier-release-2

~vanvugt/mir/earlier-release-2

Viewing all changes in revision 2882.

Committer: Daniel van Vugt
Date: 2015-08-27 06:01:31 UTC
mfrom: (2868.1.10 better-scaling-test)
Revision ID: daniel.van.vugt@canonical.com-20150827060131-7eon11xvwkbr595w

Merge latest parent branch (including trunk)

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

src/server/input/default_event_builder.cpp

src/server/input/default_event_builder.h

files modified:
examples/basic.c

include/platform/mir/input/input_device.h

src/include/common/mir/frontend/client_constants.h

src/platforms/mesa/server/x11/CMakeLists.txt

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

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

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

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

src/server/input/CMakeLists.txt

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

tests/include/mir/test/gmock_fixes.h

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/test_gmock_fixes.cpp

Show diffs side-by-side

added added

removed removed

examples/basic.c

include/platform/mir/input/event_builder.h

include/platform/mir/input/input_device.h

src/include/common/mir/frontend/client_constants.h

src/platforms/mesa/server/x11/CMakeLists.txt

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

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

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

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

src/server/input/CMakeLists.txt

src/server/input/default_event_builder.cpp

src/server/input/default_event_builder.h

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

tests/include/mir/test/gmock_fixes.h

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_device_impl.h

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/test_gmock_fixes.cpp

Older »