[glib: 5/5] Merge branch 'wip/muktupavels/per-desktop-overrides' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 4993f2b7e5040039fda39d476ddf2b4a7a979a6f
Merge: a65ee63c7 b618ec40a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jun 25 10:32:44 2018 +0000

    Merge branch 'wip/muktupavels/per-desktop-overrides' into 'master'
    
    GSettings: per-desktop overrides
    
    Closes #1013
    
    See merge request GNOME/glib!105

 gio/glib-compile-schemas.c                   |  84 +++++++++++++++++++--
 gio/gsettings.c                              |  41 +++++++----
 gio/gsettingsschema-internal.h               |   2 +
 gio/gsettingsschema.c                        |  41 +++++++++++
 gio/tests/Makefile.am                        |   2 +
 gio/tests/gsettings.c                        | 106 ++++++++++++++++++++++++++-
 gio/tests/org.gtk.test.gschema.override.orig |   2 +
 gio/tests/org.gtk.test.gschema.xml.orig      |   6 ++
 8 files changed, 259 insertions(+), 25 deletions(-)
---