Merge lp:~mterry/ubuntu-system-settings/power-dialog-fix-rtm into lp:ubuntu-system-settings/rtm-14.09
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ken VanDine | ||||
Approved revision: | 1004 | ||||
Merged at revision: | 1004 | ||||
Proposed branch: | lp:~mterry/ubuntu-system-settings/power-dialog-fix-rtm | ||||
Merge into: | lp:ubuntu-system-settings/rtm-14.09 | ||||
Diff against target: |
30 lines (+5/-15) 1 file modified
wizard/qml/main.qml (+5/-15) |
||||
To merge this branch: | bzr merge lp:~mterry/ubuntu-system-settings/power-dialog-fix-rtm | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ken VanDine | Approve | ||
Review via email: mp+252639@code.launchpad.net |
Commit message
Fix power dialog not appearing in the welcome wizard (LP: #1430942)
Description of the change
Fix power dialog not appearing in the welcome wizard (LP: #1430942)
== Checklist ==
* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
* Did you build your software in a clean sbuild/pbuilder chroot or ppa?
Just qml changes
* Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
Just qml changes
* Has your component "TestPlan” been executed successfully on emulator, N4?
I tested on live N4
* Has a 5 minute exploratory testing run been executed on N4?
Yes
* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
NA
* If you changed the UI, did you subscribe the design-reviewers to this MP?
NA
* What components might get impacted by your changes?
Just wizard
* Have you requested review by the teams of these owning components?
Yes
Thanks!