[glib: 3/3] Merge branch 'wip/start-2-70' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 9106fd4e81fe030777d757b4056e9fa25eb27a84
Merge: bdea78295 3a0edbed5
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Mar 18 14:47:00 2021 +0000

    Merge branch 'wip/start-2-70' into 'master'
    
    gversionmacros: Add version macros for GLib 2.70
    
    See merge request GNOME/glib!1965

 docs/reference/gio/gio-docs.xml         |  4 +++
 docs/reference/glib/glib-docs.xml       |  4 +++
 docs/reference/glib/glib-sections.txt   | 14 +++++++++++
 docs/reference/gobject/gobject-docs.xml |  4 +++
 docs/reference/meson.build              |  2 +-
 glib/gversionmacros.h                   | 44 +++++++++++++++++++++++++++++++++
 meson.build                             |  2 +-
 7 files changed, 72 insertions(+), 2 deletions(-)
---