Merge lp://qastaging/~unity-team/qtmir/gles-sync1 into lp://qastaging/qtmir/gles
Proposed by
Gerry Boland
| Status: | Merged |
|---|---|
| Merged at revision: | 158 |
| Proposed branch: | lp://qastaging/~unity-team/qtmir/gles-sync1 |
| Merge into: | lp://qastaging/qtmir/gles |
| Diff against target: |
36 lines (+10/-1) (has conflicts) 2 files modified
debian/changelog (+9/-0) debian/control (+1/-1) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/qtmir/gles-sync1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir development team | Pending | ||
|
Review via email:
|
|||
Commit message
Surface-based WM
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
