diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-01-15 10:45:39 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-01-15 10:45:39 +0100 |
| commit | b4fa6cc90961c87b28e26b469863f19a1be26ce2 (patch) | |
| tree | e2db30c88db958a1afffc94eeb2b3d01203eb2d3 /libguile/feature.c | |
| parent | e0c211bb2e80605b4ae3fb121c34136f6e266b70 (diff) | |
| parent | 18c5bffe96947ee82a29b115e758d7357cefbbe9 (diff) | |
| download | guile-b4fa6cc90961c87b28e26b469863f19a1be26ce2.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
There is a failing test due to a scm_from_utf8_stringn bug brought out
by the iconv test that will be fixed in the next commit.
Conflicts:
libguile/deprecated.h
module/ice-9/deprecated.scm
Diffstat (limited to 'libguile/feature.c')
| -rw-r--r-- | libguile/feature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/feature.c b/libguile/feature.c index c11cb5e9e..9eb82ee7d 100644 --- a/libguile/feature.c +++ b/libguile/feature.c @@ -1,5 +1,5 @@ /* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - * 2006, 2007, 2009, 2011 Free Software Foundation, Inc. + * 2006, 2007, 2009, 2011, 2013 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 |