Merge lp:~donadigo/switchboard-plug-parental-controls/client-desktop-fixes into lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk
Proposed by
Adam Bieńkowski
Status: | Rejected |
---|---|
Rejected by: | Adam Bieńkowski |
Proposed branch: | lp:~donadigo/switchboard-plug-parental-controls/client-desktop-fixes |
Merge into: | lp:~elementary-pantheon/switchboard-plug-parental-controls/trunk |
Diff against target: |
23 lines (+6/-1) 2 files modified
data/pantheon-parental-controls-client.desktop (+5/-1) debian/links (+1/-0) |
To merge this branch: | bzr merge lp:~donadigo/switchboard-plug-parental-controls/client-desktop-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
elementary Pantheon team | Pending | ||
Review via email: mp+304558@code.launchpad.net |
Commit message
* Add missing entries in the client desktop file
Description of the change
This branch adds missing entries to the client desktop file for linking it in deb-packaging to /etc/xdg/autostart.
To post a comment you must log in.
Unmerged revisions
- 227. By Adam Bieńkowski
-
Add links file
- 226. By Adam Bieńkowski
-
Add missing client desktop entries
New branch was proposed here: https:/ /code.launchpad .net/~donadigo/ switchboard- plug-parental- controls/ debian- packaging- fixes/+ merge/305349