[glib: 3/3] Merge branch 'version-bump-2.68' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 51a135a27274a73819e304e9fbba07a327210ade
Merge: 854abcd1a c51a8ce8c
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Thu Oct 1 15:30:47 2020 +0000

    Merge branch 'version-bump-2.68' into 'master'
    
    Add version macros for 2.68
    
    See merge request GNOME/glib!1674

 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(-)
---