Merge lp:~ken-vandine/content-hub/lp1394211 into lp:content-hub
Proposed by
Ken VanDine
Status: | Merged |
---|---|
Approved by: | Michael Sheldon |
Approved revision: | 168 |
Merged at revision: | 168 |
Proposed branch: | lp:~ken-vandine/content-hub/lp1394211 |
Merge into: | lp:content-hub |
Diff against target: |
104 lines (+10/-8) 5 files modified
po/CMakeLists.txt (+1/-1) src/com/ubuntu/content/detail/i18n.cpp (+1/-1) src/com/ubuntu/content/detail/i18n.h (+1/-1) src/com/ubuntu/content/detail/service.cpp (+5/-5) src/com/ubuntu/content/detail/service.h (+2/-0) |
To merge this branch: | bzr merge lp:~ken-vandine/content-hub/lp1394211 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Sheldon (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+242256@code.launchpad.net |
Commit message
Fixed conflict with nih-dbus and our own i18n wrapper
Description of the change
Fixed conflict with nih-dbus and our own i18n wrapper
To post a comment you must log in.
PASSED: Continuous integration, rev:168 jenkins. qa.ubuntu. com/job/ content- hub-ci/ 209/ jenkins. qa.ubuntu. com/job/ content- hub-vivid- amd64-ci/ 5 jenkins. qa.ubuntu. com/job/ content- hub-vivid- armhf-ci/ 5 jenkins. qa.ubuntu. com/job/ content- hub-vivid- armhf-ci/ 5/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ content- hub-vivid- i386-ci/ 5
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/content- hub-ci/ 209/rebuild
http://