Merge lp://qastaging/~alan-griffiths/mir/reboot-0.26.3-release into lp://qastaging/~mir-team/mir/0.26-old
Proposed by
Alan Griffiths
| Status: | Merged |
|---|---|
| Approved by: | Gerry Boland |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 4066 |
| Proposed branch: | lp://qastaging/~alan-griffiths/mir/reboot-0.26.3-release |
| Merge into: | lp://qastaging/~mir-team/mir/0.26-old |
| Diff against target: |
398 lines (+72/-44) 11 files modified
debian/control (+2/-2) debian/rules (+1/-1) include/client/mir/event_printer.h (+5/-5) include/client/mir/events/event_builders.h (+10/-10) include/client/mir_toolkit/client_types.h (+2/-6) include/client/mir_toolkit/events/keymap_event.h (+1/-1) include/client/mir_toolkit/events/surface_event.h (+1/-1) include/client/mir_toolkit/rs/mir_render_surface.h (+46/-11) include/core/mir_toolkit/deprecations.h (+2/-2) src/common/events/input_configuration_event.cpp (+1/-3) src/include/common/mir/events/input_configuration_event.h (+1/-2) |
| To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/reboot-0.26.3-release |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gerry Boland (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2017-05-26.
Commit message
Restore platforms that are unsupported in xenial, add support for building downstreams on, and re-sync deprecation macros with current development.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
looks good