Merge lp://qastaging/~michihenning/unity-scope-mediascanner/fix-camera-icon into lp://qastaging/unity-scope-mediascanner
Proposed by
Michi Henning
| Status: | Merged |
|---|---|
| Approved by: | Paweł Stołowski |
| Approved revision: | 280 |
| Merged at revision: | 282 |
| Proposed branch: | lp://qastaging/~michihenning/unity-scope-mediascanner/fix-camera-icon |
| Merge into: | lp://qastaging/unity-scope-mediascanner |
| Diff against target: |
50 lines (+10/-3) 3 files modified
debian/changelog (+7/-0) src/myvideos/CMakeLists.txt (+2/-2) src/myvideos/video-scope.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~michihenning/unity-scope-mediascanner/fix-camera-icon |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paweł Stołowski (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Updated camera-app icon to match the one used by the camera app.
Description of the change
Updated camera-app icon to match the one used by the camera app.
To post a comment you must log in.
FAILED: Continuous integration, rev:279 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- ci/188/ jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- vivid-amd64- ci/22/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- vivid-armhf- ci/22/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- vivid-i386- ci/22/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- wily-amd64- ci/15/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- wily-armhf- ci/15/console jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- wily-i386- ci/15/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-mediascan ner-ci/ 188/rebuild
http://