[gtk: 3/3] Merge branch 'overlay-scrolling-setting' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 173ffbb5474eab1e878330d494b690d15049d744
Merge: 8145872e27 97e15b8718
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 31 15:32:49 2019 +0000

    Merge branch 'overlay-scrolling-setting' into 'master'
    
    Overlay scrolling setting
    
    See merge request GNOME/gtk!873

 gdk/wayland/gdkdisplay-wayland.c |  3 ++-
 gdk/x11/gdksettings.c            |  1 +
 gtk/gtkscrolledwindow.c          | 10 +++++++++-
 gtk/gtksettings.c                | 19 ++++++++++++++++++-
 4 files changed, 30 insertions(+), 3 deletions(-)
---