[glib: 2/2] Merge branch 'revert-205059b9' into 'master'

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib: 2/2] Merge branch 'revert-205059b9' into 'master'
Date: Thu, 7 Jun 2018 16:58:46 +0000 (UTC)

commit 11a8fd6b872cd6a888180d83d9728435a4f95c9e
Merge: b04142a24 da3daf280
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Jun 7 16:57:49 2018 +0000

    Merge branch 'revert-205059b9' into 'master'
    
    Revert "Merge branch 'wip/oholy/trashing-locations' into 'master'"
    
    See merge request GNOME/glib!79

 gio/glocalfile.c      |  28 +-------------
 gio/tests/Makefile.am |   1 -
 gio/tests/meson.build |   1 -
 gio/tests/trash.c     | 104 --------------------------------------------------
 4 files changed, 1 insertion(+), 133 deletions(-)
---

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