Merge lp://qastaging/~kdub/mir/remove-self-defined-ioctl-code into lp://qastaging/mir
Proposed by
Kevin DuBois
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alan Griffiths | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1108 | ||||
Proposed branch: | lp://qastaging/~kdub/mir/remove-self-defined-ioctl-code | ||||
Merge into: | lp://qastaging/mir | ||||
Diff against target: |
13 lines (+1/-3) 1 file modified
src/shared/graphics/android/syncfence.cpp (+1/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~kdub/mir/remove-self-defined-ioctl-code | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
we had an ioctl self defined in the code. we can get this from some of the headers we depend upon already
fixes: lp1229884
Description of the change
we had an ioctl self defined in the code. we can get this from some of the headers we depend upon already
fixes: lp1229884
To post a comment you must log in.
PASSED: Continuous integration, rev:1108 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/90/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/2234 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/2119 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- saucy-amd64- ci/89 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- saucy-amd64- ci/89/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-team- mir-development -branch- ci/90/rebuild
http://