[gtk: 2/2] Merge branch 'gtkbuilder-tag-end-wrong-type' into 'master'

[Timm Bäder <baedert src gnome org>]

commit 50c63fc39a524d44f44cd67f5100064778ba5d07
Merge: 1ca5b41571 dd69c4e0f2
Author: Timm Bäder <mail baedert org>
Date:   Wed Oct 10 11:09:25 2018 +0000

    Merge branch 'gtkbuilder-tag-end-wrong-type' into 'master'
    
    GtkBuildable: Fix the type of the user_data in GtkBuildable.custom_tag_end
    
    See merge request GNOME/gtk!378

 gtk/gtkbuildable.c       | 4 ++--
 gtk/gtkbuildable.h       | 4 ++--
 gtk/gtkcellarea.c        | 4 ++--
 gtk/gtkcellview.c        | 4 ++--
 gtk/gtkcombobox.c        | 4 ++--
 gtk/gtkcontainer.c       | 4 ++--
 gtk/gtkentrycompletion.c | 2 +-
 gtk/gtkfilefilter.c      | 4 ++--
 gtk/gtkiconview.c        | 4 ++--
 gtk/gtkliststore.c       | 4 ++--
 gtk/gtktreeviewcolumn.c  | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)
---