[glib: 2/2] Merge branch 'encoding-prefix' into 'master'

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib: 2/2] Merge branch 'encoding-prefix' into 'master'
Date: Mon, 10 Dec 2018 11:43:59 +0000 (UTC)

commit af77e47e936145366bf050a36df59b33dab2f9fe
Merge: e8fb8322c e32342897
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Dec 10 11:43:37 2018 +0000

    Merge branch 'encoding-prefix' into 'master'
    
    tests: Rename macro to avoid conflict with encoding prefix
    
    See merge request GNOME/glib!521

 glib/tests/fileutils.c | 156 ++++++++++++++++++++++++-------------------------
 1 file changed, 78 insertions(+), 78 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]