diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-08-17 23:39:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-18 00:06:45 +0200 |
| commit | fbb857a472eb4e69c1cba05e86646b7004f32df6 (patch) | |
| tree | ff23e64de5a558b575ed812349d8af6e64d8ceb4 /libguile/fluids.c | |
| parent | 49c9839eae84f7f3cd10db45f389fa1ea1050659 (diff) | |
| parent | e33a910dd0f430f34c32fe6846899aee33fc2cf6 (diff) | |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
lib/Makefile.am
libguile/Makefile.am
libguile/frames.c
libguile/gc-card.c
libguile/gc-freelist.c
libguile/gc-mark.c
libguile/gc-segment.c
libguile/gc_os_dep.c
libguile/load.c
libguile/macros.c
libguile/objcodes.c
libguile/programs.c
libguile/strings.c
libguile/vm.c
m4/gnulib-cache.m4
m4/gnulib-comp.m4
m4/inline.m4
Diffstat (limited to 'libguile/fluids.c')
| -rw-r--r-- | libguile/fluids.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libguile/fluids.c b/libguile/fluids.c index 02eff9f20..75dcccf75 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -1,18 +1,19 @@ /* Copyright (C) 1996,1997,2000,2001, 2004, 2006, 2007, 2008, 2009 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 2.1 of the License, or (at your option) any later version. + * 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 + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ #ifdef HAVE_CONFIG_H |