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

[Philip Withnall <pwithnall src gnome org>]

commit 9aab30641ea7baa5e1f02cea828a6a080315eab0
Merge: aa6aa8b5e 45655b826
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Feb 20 10:38:29 2019 +0000

    Merge branch 'fix_cname' into 'master'
    
    glib-compile-resources: Fixes #1675
    
    Closes #1675
    
    See merge request GNOME/glib!633

 gio/glib-compile-resources.c           |  2 +-
 gio/tests/111_digit_test.gresource.xml |  6 ++++++
 gio/tests/meson.build                  | 25 ++++++++++++++++++++++--
 gio/tests/resources.c                  | 35 ++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 3 deletions(-)
---