Merge lp://staging/~townsend/unity/fix-lp1413165-trusty into lp://staging/unity/7.2
Proposed by
Christopher Townsend
| Status: | Merged |
|---|---|
| Approved by: | Stephen M. Webb |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3822 |
| Proposed branch: | lp://staging/~townsend/unity/fix-lp1413165-trusty |
| Merge into: | lp://staging/unity/7.2 |
| Diff against target: |
144 lines (+35/-5) 7 files modified
plugins/unityshell/src/unityshell.cpp (+14/-5) tests/MockWindowManager.h (+1/-0) unity-shared/StandaloneWindowManager.cpp (+5/-0) unity-shared/StandaloneWindowManager.h (+1/-0) unity-shared/WindowManager.h (+1/-0) unity-shared/XWindowManager.cpp (+12/-0) unity-shared/XWindowManager.h (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~townsend/unity/fix-lp1413165-trusty |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Stephen M. Webb (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Draw osk above unity shell.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Stephen M. Webb (bregma) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:3821
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://