Merge lp://staging/~azzar1/unity/fix-1413165 into lp://staging/unity
Proposed by
Andrea Azzarone
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3927 |
Proposed branch: | lp://staging/~azzar1/unity/fix-1413165 |
Merge into: | lp://staging/unity |
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/~azzar1/unity/fix-1413165 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+247150@code.staging.launchpad.net |
Commit message
Draw osk above unity shell.
To post a comment you must log in.
FAILED: Continuous integration, rev:3910 jenkins. qa.ubuntu. com/job/ unity-ci/ 1137/ jenkins. qa.ubuntu. com/job/ unity-vivid- amd64-ci/ 24/console jenkins. qa.ubuntu. com/job/ unity-vivid- armhf-ci/ 24 jenkins. qa.ubuntu. com/job/ unity-vivid- i386-ci/ 24
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/1137/ rebuild
http://