Mir

Merge lp://qastaging/~mir-team/mir/zesty-0.26 into lp://qastaging/mir/zesty

Proposed by Michał Sawicz
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 1302
Proposed branch: lp://qastaging/~mir-team/mir/zesty-0.26
Merge into: lp://qastaging/mir/zesty
Diff against target: 2049 lines (+423/-227)
37 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+20/-0)
include/client/mir/event_printer.h (+5/-5)
include/client/mir/events/event_builders.h (+10/-10)
include/client/mir_toolkit/client_types.h (+22/-25)
include/client/mir_toolkit/debug/surface.h (+4/-3)
include/client/mir_toolkit/events/event.h (+11/-10)
include/client/mir_toolkit/events/input_configuration_event.h (+8/-4)
include/client/mir_toolkit/events/keymap_event.h (+1/-1)
include/client/mir_toolkit/events/surface_event.h (+3/-2)
include/client/mir_toolkit/events/surface_output_event.h (+6/-5)
include/client/mir_toolkit/events/surface_placement.h (+2/-1)
include/client/mir_toolkit/mir_blob.h (+3/-2)
include/client/mir_toolkit/mir_buffer_stream.h (+3/-1)
include/client/mir_toolkit/mir_connection.h (+9/-8)
include/client/mir_toolkit/mir_cursor_configuration.h (+2/-1)
include/client/mir_toolkit/mir_display_configuration.h (+3/-2)
include/client/mir_toolkit/mir_persistent_id.h (+5/-4)
include/client/mir_toolkit/mir_platform_message.h (+8/-7)
include/client/mir_toolkit/mir_screencast.h (+2/-1)
include/client/mir_toolkit/mir_surface.h (+61/-60)
include/client/mir_toolkit/mir_wait.h (+3/-2)
include/client/mir_toolkit/mir_window.h (+4/-3)
include/client/mir_toolkit/rs/mir_render_surface.h (+47/-11)
include/core/mir_toolkit/common.h (+8/-6)
include/core/mir_toolkit/deprecations.h (+36/-0)
src/common/events/input_configuration_event.cpp (+1/-3)
src/include/common/mir/events/input_configuration_event.h (+1/-2)
src/platforms/android/utils/CMakeLists.txt (+1/-0)
src/platforms/mesa/server/kms/kms_page_flipper.cpp (+6/-6)
src/server/input/default_configuration.cpp (+6/-2)
src/server/input/default_device.cpp (+56/-25)
src/server/input/default_device.h (+4/-1)
src/server/input/default_input_device_hub.cpp (+15/-9)
src/server/input/default_input_device_hub.h (+5/-4)
tests/unit-tests/input/test_default_device.cpp (+23/-0)
tests/unit-tests/input/test_default_input_device_hub.cpp (+18/-0)
To merge this branch: bzr merge lp://qastaging/~mir-team/mir/zesty-0.26
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+325068@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTMa

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: