[glib/glib-2-60: 2/2] Merge branch 'cherry-pick-b17436d9' into 'glib-2-60'

From: Michael Catanzaro <mcatanzaro src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib/glib-2-60: 2/2] Merge branch 'cherry-pick-b17436d9' into 'glib-2-60'
Date: Mon, 6 May 2019 22:16:32 +0000 (UTC)

commit 3f40ca54b0aeda49d7ce96a4c9b723ff95e0a85a
Merge: a3b560817 0195a5633
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Mon May 6 22:16:14 2019 +0000

    Merge branch 'cherry-pick-b17436d9' into 'glib-2-60'
    
    Merge branch 'wip/tingping/socketclient-cancel-2' into 'master'
    
    See merge request GNOME/glib!815

 gio/gsocketclient.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
---

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