[glib: 2/2] Merge branch '1281-to-pixdata-docs' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 9716a26ab6bb4d0f0deeeedbdd3e34c296720c13
Merge: 0c85348ef b63e9889a
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jan 4 12:58:42 2021 +0000

    Merge branch '1281-to-pixdata-docs' into 'master'
    
    gresource: Document the `to-pixdata` option as being deprecated
    
    Closes #1281
    
    See merge request GNOME/glib!1826

 docs/reference/gio/glib-compile-resources.xml |  3 +++
 gio/gresource.c                               | 16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
---