[gtk: 2/2] Merge branch 'file-conflict2' into 'master'

[Benjamin Otte <otte src gnome org>]

commit 0187e91843efcb8045ef4b281a0c78f6468d937f
Merge: 7a08177a3d 5c31c721af
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Tue Apr 2 20:05:12 2019 +0000

    Merge branch 'file-conflict2' into 'master'
    
    Rename all settings schemas to avoid conflict
    
    See merge request GNOME/gtk!705

 gtk/gtkcolorchooserwidget.c                        |  2 +-
 gtk/gtkemojichooser.c                              |  2 +-
 gtk/gtkfilechooserutils.c                          |  2 +-
 gtk/gtkwindow.c                                    |  4 ++--
 gtk/meson.build                                    |  8 +++----
 ...org.gtk.gtk4.Settings.ColorChooser.gschema.xml} |  2 +-
 ...xml => org.gtk.gtk4.Settings.Debug.gschema.xml} |  2 +-
 ...org.gtk.gtk4.Settings.EmojiChooser.gschema.xml} |  2 +-
 ... org.gtk.gtk4.Settings.FileChooser.gschema.xml} | 26 +++++++++++-----------
 9 files changed, 25 insertions(+), 25 deletions(-)
---