Merge lp://staging/~kdub/mir/no-abi-break-mm into lp://staging/mir
Proposed by
kevin gunn
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~kdub/mir/no-abi-break-mm |
| Merge into: | lp://staging/mir |
| Diff against target: |
646 lines (+311/-45) 18 files modified
src/platforms/android/server/display.cpp (+5/-2) src/platforms/android/server/display_device.h (+4/-0) src/platforms/android/server/fb_device.cpp (+8/-0) src/platforms/android/server/fb_device.h (+2/-0) src/platforms/android/server/hwc_blanking_control.cpp (+13/-2) src/platforms/android/server/hwc_device.cpp (+107/-32) src/platforms/android/server/hwc_device.h (+23/-0) src/platforms/android/server/hwc_fb_device.cpp (+8/-0) src/platforms/android/server/hwc_fb_device.h (+2/-0) src/platforms/android/server/swapping_gl_context.h (+2/-0) tests/include/mir_test_doubles/mock_display_device.h (+2/-0) tests/include/mir_test_doubles/mock_swapping_gl_context.h (+2/-0) tests/include/mir_test_doubles/stub_display_builder.h (+14/-3) tests/include/mir_test_doubles/stub_swapping_gl_context.h (+2/-0) tests/unit-tests/graphics/android/hwc_struct_helpers.h (+18/-5) tests/unit-tests/graphics/android/test_display.cpp (+40/-1) tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+15/-0) tests/unit-tests/graphics/android/test_hwc_device.cpp (+44/-0) |
| To merge this branch: | bzr merge lp://staging/~kdub/mir/no-abi-break-mm |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
testing
Description of the change
testing
To post a comment you must log in.
Unmerged revisions
- 2325. By Kevin DuBois
-
merge signal
- 2324. By Kevin DuBois
-
merge bad sync branch
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
