Merge lp://staging/~ken-vandine/camera-app/lp1554621 into lp://staging/camera-app/staging
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Approved by: | Florian Boucault |
Approved revision: | 643 |
Merged at revision: | 674 |
Proposed branch: | lp://staging/~ken-vandine/camera-app/lp1554621 |
Merge into: | lp://staging/camera-app/staging |
Diff against target: |
212 lines (+30/-22) 9 files modified
GalleryView.qml (+1/-1) MimeTypeMapper.js (+1/-1) PhotogridView.qml (+1/-1) SlideshowView.qml (+1/-1) ViewFinderView.qml (+1/-1) camera-app.qml (+1/-1) po/ast.po (+10/-6) po/cy.po (+9/-5) po/sk.po (+5/-5) |
To merge this branch: | bzr merge lp://staging/~ken-vandine/camera-app/lp1554621 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+289370@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-03-16.
Commit message
Bump Ubuntu.Content import to 1.3 to fix theme issue
Description of the change
Bump Ubuntu.Content import to 1.3 to fix theme issue
To post a comment you must log in.
FAILED: Continuous integration, rev:643 jenkins. qa.ubuntu. com/job/ camera- app-ci/ 489/ jenkins. qa.ubuntu. com/job/ camera- app-vivid- amd64-ci/ 184 jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 185 jenkins. qa.ubuntu. com/job/ camera- app-vivid- armhf-ci/ 185/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ camera- app-vivid- i386-ci/ 184 jenkins. qa.ubuntu. com/job/ generic- click-autopilot -vivid- touch/437/ console jenkins. qa.ubuntu. com/job/ generic- click-autopilot -runner- touch/1107/ console jenkins. qa.ubuntu. com/job/ generic- click-builder- vivid-armhf/ 1041 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 28043
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/camera- app-ci/ 489/rebuild
http://