[Guile-commits] 02/07: Merge until badcbd0fe955e0477ae98ed743b3f274d6e6f22d from stable-2.2

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit a723f413751b1b82754ae2a0e591044e95d3a338
Merge: f85d3c0 badcbd0
Author: Andy Wingo <address@hidden>
Date:   Wed Nov 29 21:08:42 2017 +0100

    Merge until badcbd0fe955e0477ae98ed743b3f274d6e6f22d from stable-2.2
    
    Manually resolve conflicts in random.c.

 libguile/random.c            | 129 +++++++++++++++++++++++--------------------
 test-suite/tests/random.test |  47 +++++++++++++++-
 2 files changed, 114 insertions(+), 62 deletions(-)

diff --cc libguile/random.c
index a8ad075,1604b46..6dae7f3
--- a/libguile/random.c
+++ b/libguile/random.c
@@@ -1,5 -1,5 +1,5 @@@
  /* Copyright (C) 1999, 2000, 2001, 2003, 2005, 2006, 2009, 2010,
-- *    2012, 2013, 2014 Free Software Foundation, Inc.
++ *    2012, 2013, 2014, 2017 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