Merge lp://qastaging/~robert-ancell/activity-log-manager/unity-control-center2 into lp://qastaging/activity-log-manager
Proposed by
Robert Ancell
Status: | Merged |
---|---|
Merge reported by: | Robert Ancell |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~robert-ancell/activity-log-manager/unity-control-center2 |
Merge into: | lp://qastaging/activity-log-manager |
Diff against target: |
462 lines (+266/-40) 10 files modified
configure.ac (+33/-0) data/Makefile.am (+7/-5) data/unity-activity-log-manager-panel.desktop.in (+25/-0) po/POTFILES.in (+1/-0) po/POTFILES.skip (+12/-0) src/Makefile.am (+7/-34) src/alm-cc.c (+4/-0) src/diagnostics-widget.c (+1/-1) src/gnome-control-center/Makefile.am (+87/-0) src/unity-control-center/Makefile.am (+89/-0) |
To merge this branch: | bzr merge lp://qastaging/~robert-ancell/activity-log-manager/unity-control-center2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Activity Log Manager | Pending | ||
Review via email:
|
Commit message
Add support for Unity Control Center.
To post a comment you must log in.
FAILED: Continuous integration, rev:95 jenkins. qa.ubuntu. com/job/ activity- log-manager- ci/9/ jenkins. qa.ubuntu. com/job/ activity- log-manager- trusty- amd64-ci/ 9/console jenkins. qa.ubuntu. com/job/ activity- log-manager- trusty- armhf-ci/ 9/console jenkins. qa.ubuntu. com/job/ activity- log-manager- trusty- i386-ci/ 9/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/activity- log-manager- ci/9/rebuild
http://