[glib: 2/2] Merge branch 'glib-gresource-ld-binary' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 3924ef6ac1130b1abf54b2a52ffafd97a9067e8e
Merge: c33a98f42 d04b9c371
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Dec 19 17:10:00 2018 +0000

    Merge branch 'glib-gresource-ld-binary' into 'master'
    
    glib-compile-resources: Add external data option
    
    Closes #1489
    
    See merge request GNOME/glib!553

 docs/reference/gio/glib-compile-resources.xml | 10 ++++
 gio/glib-compile-resources.c                  | 71 ++++++++++++++++-----------
 gio/tests/Makefile.am                         | 15 +++++-
 gio/tests/meson.build                         | 67 ++++++++++++++++++++++---
 gio/tests/resources.c                         | 38 ++++++++++++++
 gio/tests/test5.gresource.xml                 |  6 +++
 6 files changed, 171 insertions(+), 36 deletions(-)
---