← Back to branch summary

~alan-griffiths/mir/fullscreen-sticks

~alan-griffiths/mir/fullscreen-sticks

Viewing all changes in revision 3099.

Committer: Alan Griffiths
Date: 2015-11-23 10:45:48 UTC
mfrom: (3095.1.18 development-branch)
Revision ID: alan@octopull.co.uk-20151123104548-22k2skz9dixhjfqp

merge lp:mir

files added:
include/common/mir/assert_module_entry_point.h

files modified:
include/client/mir_toolkit/mir_buffer_stream.h

include/test/mir_test_framework/async_server_runner.h

src/client/buffer_stream.cpp

src/platforms/android/client/client_platform_factory.cpp

src/platforms/android/server/platform.cpp

src/platforms/evdev/evdev_device_detection.cpp

src/platforms/evdev/libinput_device_ptr.cpp

src/platforms/evdev/libinput_device_ptr.h

src/platforms/evdev/platform.cpp

src/platforms/evdev/platform_factory.cpp

src/platforms/mesa/client/client_platform_factory.cpp

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

src/platforms/mesa/server/x11/graphics/graphics.cpp

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

tests/mir_test_framework/async_server_runner.cpp

tests/mir_test_framework/platform_graphics_dummy.cpp

tests/mir_test_framework/stub_input.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

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

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

Show diffs side-by-side

added added

removed removed

include/client/mir_toolkit/mir_buffer_stream.h

include/common/mir/assert_module_entry_point.h

include/test/mir_test_framework/async_server_runner.h

src/client/buffer_stream.cpp

src/platforms/android/client/client_platform_factory.cpp

src/platforms/android/server/platform.cpp

src/platforms/evdev/evdev_device_detection.cpp

src/platforms/evdev/libinput_device_ptr.cpp

src/platforms/evdev/libinput_device_ptr.h

src/platforms/evdev/platform.cpp

src/platforms/evdev/platform_factory.cpp

src/platforms/mesa/client/client_platform_factory.cpp

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

src/platforms/mesa/server/x11/graphics/graphics.cpp

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

tests/mir_test_framework/async_server_runner.cpp

tests/mir_test_framework/platform_graphics_dummy.cpp

tests/mir_test_framework/stub_input.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

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

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

Older »