Merge lp://staging/~laney/ubuntu-system-settings/lp1631997 into lp://staging/ubuntu-system-settings
Proposed by
Iain Lane
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~laney/ubuntu-system-settings/lp1631997 |
Merge into: | lp://staging/ubuntu-system-settings |
Diff against target: |
8 lines (+1/-0) 1 file modified
ubuntu-system-settings.desktop.in.in (+1/-0) |
To merge this branch: | bzr merge lp://staging/~laney/ubuntu-system-settings/lp1631997 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Needs Fixing | ||
Jonas G. Drange (community) | Approve | ||
Review via email: mp+308065@code.staging.launchpad.net |
Commit message
Add OnlyShowIn=Unity8 to the desktop file, so we don't get two "System Settings" in a Unity 7 session, now that u-s-s is installed by default.
To post a comment you must log in.
I think I would prefer to upload this as an ubuntu2, and not wait for it to be merged, and not push it myself.
1) There's not much time before 16.10 now and it would be good for this to be on images (QA might take a while)
2) I'm not sure whether this OnlyShowIn will work on the vivid/xenial phone environments so might not be ready to land there
Feel free to do whatever you think is best with this MP