[Guile-commits] 01/01: Merge remote-tracking branch 'origin/stable-2.2'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit bcb4f7dca84d1e4dfd5a56076f31a0eadcaf5872
Merge: 114198d edf5aea
Author: Andy Wingo <address@hidden>
Date:   Wed Dec 11 21:26:54 2019 +0100

    Merge remote-tracking branch 'origin/stable-2.2'

 libguile/finalizers.c | 31 ++++++++++++++++++-------------
 libguile/ports.c      |  2 +-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --cc libguile/finalizers.c
index 3d1126f,94a6e6b..0d37c2f
--- a/libguile/finalizers.c
+++ b/libguile/finalizers.c
@@@ -1,21 -1,20 +1,21 @@@
- /* Copyright 2012-2014,2018
 -/* Copyright (C) 2012, 2013, 2014, 2019 Free Software Foundation, Inc.
 - *
 - * This library is free software; you can redistribute it and/or
 - * modify it under the terms of the GNU Lesser General Public License
 - * as published by the Free Software Foundation; either version 3 of
 - * the License, or (at your option) any later version.
 - *
 - * This library is distributed in the hope that it will be useful, but
 - * WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 - * Lesser General Public License for more details.
 - *
 - * You should have received a copy of the GNU Lesser General Public
 - * License along with this library; if not, write to the Free Software
 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 - * 02110-1301 USA
 - */
++/* Copyright 2012-2014,2018-2019
 +     Free Software Foundation, Inc.
 +
 +   This file is part of Guile.
 +
 +   Guile is free software: you can redistribute it and/or modify it
 +   under the terms of the GNU Lesser General Public License as published
 +   by the Free Software Foundation, either version 3 of the License, or
 +   (at your option) any later version.
 +
 +   Guile is distributed in the hope that it will be useful, but WITHOUT
 +   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 +   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 +   License for more details.
 +
 +   You should have received a copy of the GNU Lesser General Public
 +   License along with Guile.  If not, see
 +   <https://www.gnu.org/licenses/>.  */