[gtk/gtk-3-24: 2/2] Merge branch 'xdg-output-3-24' into 'gtk-3-24'

[Matthias Clasen <matthiasc src gnome org>]

commit fbf88d285e3e8623b546e88b5ff89680f1e6a580
Merge: 56cfc65909 1f64689c31
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed May 1 03:35:19 2019 +0000

    Merge branch 'xdg-output-3-24' into 'gtk-3-24'
    
    [3.24] wayland: Add support for xdg-output
    
    See merge request GNOME/gtk!750

 gdk/wayland/Makefile.am          |   2 +
 gdk/wayland/gdkdisplay-wayland.c |   7 ++
 gdk/wayland/gdkdisplay-wayland.h |   2 +
 gdk/wayland/gdkmonitor-wayland.h |   9 ++
 gdk/wayland/gdkprivate-wayland.h |   2 +
 gdk/wayland/gdkscreen-wayland.c  | 190 +++++++++++++++++++++++++++++++--------
 gdk/wayland/meson.build          |   1 +
 7 files changed, 176 insertions(+), 37 deletions(-)
---