Merge lp:~alan-griffiths/mir/create-accessory into lp:~mir-team/mir/trunk
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | Robert Ancell |
Approved revision: | no longer in the source branch. |
Merged at revision: | 498 |
Proposed branch: | lp:~alan-griffiths/mir/create-accessory |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
73 lines (+10/-4) 6 files modified
debian/libmirclient-demos.examples (+3/-3) examples/CMakeLists.txt (+1/-0) src/CMakeLists.txt (+1/-0) src/accessory/CMakeLists.txt (+3/-0) src/shared/CMakeLists.txt (+0/-1) tests/integration-tests/CMakeLists.txt (+2/-0) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/create-accessory |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+153210@code.launchpad.net |
Commit message
accessory: a place for that supplementary code, used mainly for convenience.
Description of the change
accessory: a place for that supplementary code, used mainly for convenience.
To post a comment you must log in.
FAILED: Continuous integration, rev:498 jenkins. qa.ubuntu. com/job/ mir-ci/ 72/ jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 73/console
http://
Executed test runs:
FAILURE: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ mir-ci/ 72/rebuild
http://