[glib: 2/2] Merge branch 'instantiatable' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit ddef9ba2f8a0d8d0aadef527652c63fbac799114
Merge: e4721dfff 4f2b1e250
Author: Sebastian Dröge <slomo coaxion net>
Date:   Fri Nov 13 15:29:07 2020 +0000

    Merge branch 'instantiatable' into 'master'
    
    gobject: Standardise on the term ‘instantiatable’
    
    See merge request GNOME/glib!1735

 docs/reference/gio/gdbus-codegen.xml   |  4 ++--
 docs/reference/gobject/tut_gobject.xml |  6 ++---
 docs/reference/gobject/tut_gtype.xml   | 42 +++++++++++++++++-----------------
 docs/reference/gobject/tut_howto.xml   |  2 +-
 gobject/gobject.c                      |  4 ++--
 gobject/gtype.c                        | 10 ++++----
 gobject/gtype.h                        |  2 +-
 gobject/gtypeplugin.c                  |  2 +-
 gobject/gtypeplugin.h                  |  2 +-
 9 files changed, 37 insertions(+), 37 deletions(-)
---