Merge lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-yakkety-landing-076 into lp://staging/qtmir
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Merged at revision: | 528 |
| Proposed branch: | lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-yakkety-landing-076 |
| Merge into: | lp://staging/qtmir |
| Diff against target: |
764 lines (+106/-334) 17 files modified
CMakeLists.txt (+1/-1) debian/changelog (+7/-0) debian/control (+2/-2) debian/gles-patches/convert-to-gles.patch (+1/-1) src/modules/Unity/Application/CMakeLists.txt (+0/-1) src/modules/Unity/Application/mirsurface.cpp (+36/-0) src/modules/Unity/Application/mirsurface.h (+8/-1) src/modules/Unity/Application/mirsurfaceinterface.h (+2/-0) src/modules/Unity/Application/mirsurfaceitem.cpp (+11/-49) src/modules/Unity/Application/mirsurfaceitem.h (+1/-2) src/modules/Unity/Application/plugin.cpp (+0/-10) src/modules/Unity/Application/ubuntukeyboardinfo.cpp (+0/-173) src/modules/Unity/Application/ubuntukeyboardinfo.h (+0/-87) src/platforms/mirserver/mirwindowmanager.cpp (+9/-4) src/platforms/mirserver/surfaceobserver.cpp (+20/-0) src/platforms/mirserver/surfaceobserver.h (+3/-1) tests/framework/fake_mirsurface.h (+5/-2) |
| To merge this branch: | bzr merge lp://staging/~ci-train-bot/qtmir/qtmir-ubuntu-yakkety-landing-076 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
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
