Merge lp://qastaging/~mterry/unity-control-center/onlyshowin-unity7-take2 into lp://qastaging/unity-control-center
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Approved by: | Robert Ancell |
| Approved revision: | 12881 |
| Merged at revision: | 12881 |
| Proposed branch: | lp://qastaging/~mterry/unity-control-center/onlyshowin-unity7-take2 |
| Merge into: | lp://qastaging/unity-control-center |
| Diff against target: |
214 lines (+17/-17) 17 files modified
panels/appearance/unity-appearance-panel.desktop.in.in (+1/-1) panels/bluetooth/unity-bluetooth-panel.desktop.in.in (+1/-1) panels/color/unity-color-panel.desktop.in.in (+1/-1) panels/datetime/unity-datetime-panel.desktop.in.in (+1/-1) panels/display/unity-display-panel.desktop.in.in (+1/-1) panels/info/unity-info-panel.desktop.in.in (+1/-1) panels/keyboard/unity-keyboard-panel.desktop.in.in (+1/-1) panels/mouse/unity-mouse-panel.desktop.in.in (+1/-1) panels/network/unity-network-panel.desktop.in.in (+1/-1) panels/power/unity-power-panel.desktop.in.in (+1/-1) panels/region/unity-region-panel.desktop.in.in (+1/-1) panels/screen/unity-screen-panel.desktop.in.in (+1/-1) panels/sound/data/unity-sound-panel.desktop.in.in (+1/-1) panels/universal-access/unity-universal-access-panel.desktop.in.in (+1/-1) panels/user-accounts/data/unity-user-accounts-panel.desktop.in.in (+1/-1) panels/wacom/unity-wacom-panel.desktop.in.in (+1/-1) shell/unity-control-center.desktop.in.in (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~mterry/unity-control-center/onlyshowin-unity7-take2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ancell | Approve | ||
|
Review via email:
|
|||
Commit message
Only show Unity Control Center in unity7.
Description of the change
Unity8 has Ubuntu System Settings.
(second MP because launchpad balked at the first)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good - I checked my current Unity is reporting:
$ echo $XDG_CURRENT_
Unity:Unity7
I don't think there's any backwards compatibility issues with this change.