Merge lp://staging/~alan-griffiths/mir/reboot-0.26.3-release into lp://staging/mir
Proposed by
Alan Griffiths
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~alan-griffiths/mir/reboot-0.26.3-release |
| Merge into: | lp://staging/mir |
| Diff against target: |
1811 lines (+1205/-14) (has conflicts) 23 files modified
CMakeLists.txt (+5/-0) debian/changelog (+54/-0) debian/control (+69/-0) include/client/mir_toolkit/client_types.h (+10/-0) include/client/mir_toolkit/extensions/gbm_buffer.h (+82/-0) include/client/mir_toolkit/mir_buffer_stream.h (+8/-0) include/client/mir_toolkit/mir_cursor_configuration.h (+18/-1) include/client/mir_toolkit/mir_window.h (+29/-0) include/client/mir_toolkit/rs/mir_render_surface.h (+103/-0) include/core/mir_toolkit/deprecations.h (+39/-0) src/platforms/android/utils/CMakeLists.txt.OTHER (+46/-0) src/platforms/mesa/client/client_platform.cpp (+145/-0) src/platforms/mesa/server/kms/real_kms_display_configuration.cpp (+214/-0) src/server/compositor/multi_monitor_arbiter.cpp (+7/-0) src/server/input/default_device.cpp (+46/-0) src/server/input/default_device.h (+16/-0) src/server/input/default_input_device_hub.cpp (+18/-1) src/server/input/default_input_device_hub.h (+4/-0) tests/acceptance-tests/test_custom_window_management.cpp (+50/-0) tests/acceptance-tests/test_presentation_chain.cpp (+184/-12) tests/unit-tests/input/test_default_device.cpp (+26/-0) tests/unit-tests/input/test_default_input_device_hub.cpp (+24/-0) tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp (+8/-0) Text conflict in CMakeLists.txt Text conflict in debian/control Text conflict in include/client/mir_toolkit/client_types.h Text conflict in include/client/mir_toolkit/extensions/gbm_buffer.h Text conflict in include/client/mir_toolkit/mir_buffer_stream.h Text conflict in include/client/mir_toolkit/mir_cursor_configuration.h Text conflict in include/client/mir_toolkit/mir_window.h Text conflict in include/client/mir_toolkit/rs/mir_render_surface.h Text conflict in include/core/mir_toolkit/deprecations.h Conflict adding files to src/platforms/android. Created directory. Conflict because src/platforms/android is not versioned, but has versioned children. Versioned directory. Conflict adding files to src/platforms/android/utils. Created directory. Conflict because src/platforms/android/utils is not versioned, but has versioned children. Versioned directory. Contents conflict in src/platforms/android/utils/CMakeLists.txt Text conflict in src/platforms/mesa/client/client_platform.cpp Text conflict in src/platforms/mesa/server/kms/real_kms_display_configuration.cpp Text conflict in src/server/compositor/multi_monitor_arbiter.cpp Text conflict in src/server/input/default_device.cpp Text conflict in src/server/input/default_device.h Text conflict in src/server/input/default_input_device_hub.cpp Text conflict in src/server/input/default_input_device_hub.h Text conflict in tests/acceptance-tests/test_custom_window_management.cpp Text conflict in tests/acceptance-tests/test_presentation_chain.cpp Text conflict in tests/unit-tests/input/test_default_device.cpp Text conflict in tests/unit-tests/input/test_default_input_device_hub.cpp Text conflict in tests/unit-tests/platforms/nested/mir_display_configuration_builder.cpp |
| To merge this branch: | bzr merge lp://staging/~alan-griffiths/mir/reboot-0.26.3-release |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by 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
