Merge lp://staging/~khurshid-alam/unity-settings-daemon/usd-schemas-focal into lp://staging/unity-settings-daemon
Proposed by
Khurshid Alam
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | 4201 |
Merged at revision: | 4201 |
Proposed branch: | lp://staging/~khurshid-alam/unity-settings-daemon/usd-schemas-focal |
Merge into: | lp://staging/unity-settings-daemon |
Diff against target: |
1636 lines (+1045/-74) 42 files modified
data/Makefile.am (+21/-1) data/com.canonical.unity.settings-daemon.peripherals.gschema.xml.in.in (+182/-0) data/com.canonical.unity.settings-daemon.peripherals.wacom.gschema.xml.in.in (+203/-0) data/com.canonical.unity.settings-daemon.plugins.color.gschema.xml.in.in (+55/-0) data/com.canonical.unity.settings-daemon.plugins.datetime.gschema.xml.in.in (+15/-0) data/com.canonical.unity.settings-daemon.plugins.gschema.xml.in.in (+167/-0) data/com.canonical.unity.settings-daemon.plugins.housekeeping.gschema.xml.in.in (+42/-0) data/com.canonical.unity.settings-daemon.plugins.keyboard.gschema.xml.in.in (+15/-0) data/com.canonical.unity.settings-daemon.plugins.orientation.gschema.xml.in.in (+15/-0) data/com.canonical.unity.settings-daemon.plugins.power.gschema.xml.in.in (+144/-0) data/com.canonical.unity.settings-daemon.plugins.print-notifications.gschema.xml.in.in (+15/-0) data/com.canonical.unity.settings-daemon.plugins.sharing.gschema.xml.in.in (+22/-0) data/com.canonical.unity.settings-daemon.plugins.xrandr.gschema.xml.in.in (+25/-0) data/com.canonical.unity.settings-daemon.plugins.xsettings.gschema.xml.in.in (+45/-0) data/gnome-settings-daemon.convert (+15/-15) data/gsd-enums.h (+8/-0) debian/control (+0/-1) gnome-settings-daemon/gnome-settings-manager.c (+1/-1) gnome-settings-daemon/main.c (+1/-1) plugins/color/gsd-color-manager.c (+1/-1) plugins/common/gsd-input-helper.c (+1/-1) plugins/common/input-device-example.sh (+1/-1) plugins/common/test-plugin.h (+4/-4) plugins/housekeeping/gsd-disk-space.c (+1/-1) plugins/housekeeping/gsd-ldsm-dialog.c (+1/-1) plugins/keyboard/gsd-keyboard-manager.c (+7/-8) plugins/media-keys/gsd-media-keys-manager.c (+2/-2) plugins/mouse/gsd-mouse-manager.c (+6/-6) plugins/orientation/gsd-orientation-manager.c (+1/-1) plugins/power/gsd-power-manager.c (+2/-2) plugins/power/test.py (+1/-1) plugins/sharing/gsd-sharing-manager.c (+2/-2) plugins/smartcard/gsd-smartcard-plugin.c (+1/-1) plugins/updates/gsd-updates-common.h (+1/-1) plugins/updates/gsd-updates-manager.c (+1/-1) plugins/wacom/README.config-storage (+7/-7) plugins/wacom/gsd-wacom-device.c (+6/-6) plugins/wacom/gsd-wacom-osd-window.c (+1/-1) plugins/wacom/wacom.gresource.xml (+1/-1) plugins/xrandr/gsd-xrandr-manager.c (+1/-1) plugins/xsettings/gsd-xsettings-gtk.c (+1/-1) plugins/xsettings/gsd-xsettings-manager.c (+4/-4) |
To merge this branch: | bzr merge lp://staging/~khurshid-alam/unity-settings-daemon/usd-schemas-focal |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Review via email:
|
Commit message
* Port rest of the schemas gnome-settings-
* When upstream moved persistant numlock-state to gsettings-
* Remove gnome-settings-
To post a comment you must log in.
Thanks