Merge lp://qastaging/~alan-griffiths/unity-system-compositor/private-mir-connection into lp://qastaging/unity-system-compositor
Proposed by
Alan Griffiths
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~alan-griffiths/unity-system-compositor/private-mir-connection |
| Merge into: | lp://qastaging/unity-system-compositor |
| Diff against target: |
213 lines (+69/-19) 5 files modified
debian/control (+2/-0) src/dm_connection.cpp (+48/-3) src/dm_connection.h (+7/-5) src/system_compositor.cpp (+11/-11) src/system_compositor.h (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/unity-system-compositor/private-mir-connection |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity System Compositor Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
Fix conflicts in lp:~robert-ancell/lightdm/private-mir-connection
Description of the change
Fix conflicts in lp:~robert-ancell/lightdm/private-mir-connection
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
