Merge branch 'patch-1' into 'master'

doc: fix typo in gio/gresource.c

See merge request GNOME/glib!973
This commit is contained in:
Philip Withnall 2019-07-08 12:17:03 +00:00
commit 18cfe50caa

View File

@ -78,7 +78,7 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref)
* *
* `to-pixdata` which will use the gdk-pixbuf-pixdata command to convert * `to-pixdata` which will use the gdk-pixbuf-pixdata command to convert
* images to the GdkPixdata format, which allows you to create pixbufs directly using the data inside * images to the GdkPixdata format, which allows you to create pixbufs directly using the data inside
* the resource file, rather than an (uncompressed) copy if it. For this, the gdk-pixbuf-pixdata * the resource file, rather than an (uncompressed) copy of it. For this, the gdk-pixbuf-pixdata
* program must be in the PATH, or the `GDK_PIXBUF_PIXDATA` environment variable must be * program must be in the PATH, or the `GDK_PIXBUF_PIXDATA` environment variable must be
* set to the full path to the gdk-pixbuf-pixdata executable; otherwise the resource compiler will * set to the full path to the gdk-pixbuf-pixdata executable; otherwise the resource compiler will
* abort. * abort.