Merge lp://qastaging/~alan-griffiths/mir/move-miral-to-mir-cleanup-playground into lp://qastaging/mir
Proposed by
Alan Griffiths
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~alan-griffiths/mir/move-miral-to-mir-cleanup-playground |
| Merge into: | lp://qastaging/mir |
| Prerequisite: | lp://qastaging/~alan-griffiths/mir/move-miral-to-mir-cleanup |
| Diff against target: |
3504 lines (+2/-3095) 43 files modified
examples/miral-shell/CMakeLists.txt (+0/-68) include/miral/miral/command_line_option.h (+0/-112) include/miral/miral/window_management_policy_addendum3.h (+0/-71) include/server/mir/compositor/scene_element.h (+0/-4) include/server/mir/scene/surface.h (+0/-1) include/test/mir/test/doubles/stub_surface.h (+0/-1) playground/CMakeLists.txt (+1/-22) playground/demo-shell/CMakeLists.txt (+0/-19) playground/demo-shell/demo_compositor.cpp (+0/-204) playground/demo-shell/demo_compositor.h (+0/-79) playground/demo-shell/demo_renderer.cpp (+0/-402) playground/demo-shell/demo_renderer.h (+0/-90) playground/demo-shell/demo_shell.cpp (+0/-120) playground/demo-shell/typo/CMakeLists.txt (+0/-23) playground/demo-shell/typo/typo_freetype_renderer.cpp (+0/-125) playground/demo-shell/typo/typo_freetype_renderer.h (+0/-44) playground/demo-shell/typo/typo_glcache.cpp (+0/-99) playground/demo-shell/typo/typo_glcache.h (+0/-56) playground/demo-shell/typo/typo_renderer.cpp (+0/-59) playground/demo-shell/typo/typo_renderer.h (+0/-61) playground/demo-shell/typo/typo_stub_renderer.cpp (+0/-47) playground/demo-shell/typo/typo_stub_renderer.h (+0/-34) playground/demo-shell/window_manager.cpp (+0/-611) playground/demo-shell/window_manager.h (+0/-97) playground/server_configuration.cpp (+0/-86) playground/server_configuration.h (+0/-49) playground/server_example_display_configuration_policy.cpp (+0/-115) playground/server_example_display_configuration_policy.h (+0/-62) src/include/server/mir/compositor/decoration.h (+0/-38) src/miral/CMakeLists.txt (+0/-142) src/miral/miral.pc.in (+0/-12) src/miral/mirclientcpp.pc.in (+0/-10) src/server/scene/basic_surface.cpp (+0/-6) src/server/scene/basic_surface.h (+1/-1) src/server/scene/surface_stack.cpp (+0/-11) tests/include/mir/test/doubles/stub_scene_element.h (+0/-6) tests/include/mir/test/doubles/stub_scene_surface.h (+0/-1) tests/mir_test_framework/stub_surface.cpp (+0/-5) tests/unit-tests/CMakeLists.txt (+0/-2) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+0/-7) tests/unit-tests/scene/test_basic_surface.cpp (+0/-14) tests/unit-tests/scene/test_surface.cpp (+0/-21) tests/unit-tests/scene/test_surface_stack.cpp (+0/-58) |
| To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/move-miral-to-mir-cleanup-playground |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
Incorporate miral project into mir source tree
This is a third pass at removing code obsoleted by MirAL
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
