Merge branch 'master' into 'issue1084'
authorMatthias Clasen <mclasen@redhat.com>
Wed, 20 Jun 2018 14:21:24 +0000 (14:21 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 20 Jun 2018 14:21:24 +0000 (14:21 +0000)
commitcd99f82e0c16e565490480ff8d9f9e1ffbc23018
tree0c05b45702d39f3b41e465babfe4eabb6fb929a7
parent07d6c533468c003262093cc0a9f9b9abcc470d6d
parent29fee2e80890d778af2f028fb10e133e2c77edd0
Merge branch 'master' into 'issue1084'

# Conflicts:
#   gdk/gdk.c
gdk/gdk-private.h
gdk/gdk.c
gdk/gdkdisplay.c
gdk/gdkdisplayprivate.h
gdk/wayland/gdkdisplay-wayland.c
gdk/x11/gdkdisplay-x11.c