Merge lp:~tintou/switchboard/can-show into lp:~elementary-pantheon/switchboard/switchboard
Proposed by
Corentin Noël
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 717 | ||||
Proposed branch: | lp:~tintou/switchboard/can-show | ||||
Merge into: | lp:~elementary-pantheon/switchboard/switchboard | ||||
Diff against target: |
116 lines (+55/-3) 4 files modified
lib/Plug.vala (+2/-1) src/CategoryView.vala (+48/-1) src/Widgets/CategoryFlowBox.vala (+4/-0) src/Widgets/CategoryIcon.vala (+1/-1) |
||||
To merge this branch: | bzr merge lp:~tintou/switchboard/can-show | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
elementary Pantheon team | Pending | ||
Review via email: mp+310828@code.launchpad.net |
Commit message
Hide and Show settings panes when hardware devices are present/not present
Description of the change
To test: lp:switchboard-plug-bluetooth [Plug/Unplug a Bluetooth dongle]
To post a comment you must log in.
Attempt to merge into lp:switchboard failed due to conflicts:
text conflict in src/CategoryVie w.vala