Merge lp:~mlankhorst/mir/setsid into lp:~mir-team/mir/trunk
Proposed by
Maarten Lankhorst
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 942 |
Proposed branch: | lp:~mlankhorst/mir/setsid |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
217 lines (+97/-4) 4 files modified
src/server/graphics/gbm/gbm_platform.cpp (+10/-0) src/server/graphics/gbm/linux_virtual_terminal.cpp (+55/-2) src/server/graphics/gbm/linux_virtual_terminal.h (+5/-0) tests/unit-tests/graphics/gbm/test_linux_virtual_terminal.cpp (+27/-2) |
To merge this branch: | bzr merge lp:~mlankhorst/mir/setsid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Approve | ||
Chris Halse Rogers | Approve | ||
Robert Ancell | Approve | ||
Alexandros Frantzis (community) | Needs Information | ||
Alan Griffiths | Abstain | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+177800@code.launchpad.net |
Commit message
Re-introduce console support, and ignore control characters
To post a comment you must log in.
FAILED: Continuous integration, rev:900 /code.launchpad .net/~mlankhors t/mir/setsid/ +merge/ 177800/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http:// jenkins. qa.ubuntu. com/job/ mir-ci/ 1140/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/1498 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/1383 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 378 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 378/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= quantal, flavor= amd64/741
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 1140/rebuild
http://