[gtk: 4/4] Merge branch 'ricotz/for-master' into 'master'

[Rico Tzschichholz <ricotz src gnome org>]

commit 746a40bbfe279f257e1232dad5b7655486112024
Merge: 1087ff48f0 d1cab4fbdd
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Jul 31 19:31:40 2020 +0000

    Merge branch 'ricotz/for-master' into 'master'
    
    Add annotations to improve GIR API
    
    See merge request GNOME/gtk!2332

 gdk/x11/gdkdisplay-x11.c   | 8 ++++----
 gdk/x11/gdkglcontext-x11.c | 2 +-
 gdk/x11/gdkmonitor-x11.c   | 6 +++++-
 gdk/x11/gdksurface-x11.c   | 2 +-
 gdk/x11/gdkx11display.h    | 2 +-
 gsk/gskrendernodeimpl.c    | 2 +-
 gtk/gtkbuilderscope.c      | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)
---