Merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1391940 into lp:ubuntu-system-settings/rtm-14.09
Proposed by
Ken VanDine
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 939 |
Merged at revision: | 942 |
Proposed branch: | lp:~ken-vandine/ubuntu-system-settings/rtm-lp1391940 |
Merge into: | lp:ubuntu-system-settings/rtm-14.09 |
Prerequisite: | lp:~ken-vandine/ubuntu-system-settings/rtm-lp1336715.check.sync |
Diff against target: |
163 lines (+23/-46) 4 files modified
plugins/battery/CMakeLists.txt (+2/-2) plugins/battery/PageComponent.qml (+21/-6) plugins/battery/battery.cpp (+0/-28) plugins/battery/battery.h (+0/-10) |
To merge this branch: | bzr merge lp:~ken-vandine/ubuntu-system-settings/rtm-lp1391940 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antti Kaijanmäki (community) | Approve | ||
Ubuntu Touch System Settings | Pending | ||
Review via email: mp+241608@code.launchpad.net |
Commit message
[battery] don't control wifi state with libnm, use the QDBusActionGroup from indicator-network
Description of the change
[battery] don't control wifi state with libnm, use the QDBusActionGroup from indicator-network
To post a comment you must log in.
code LGTM.