diff options
author | Andy Wingo <wingo@pobox.com> | 2012-07-06 16:52:54 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-07-06 16:52:54 +0200 |
commit | 2aed2667fce5ccb115667a36ffd368c4c3b6e9f4 (patch) | |
tree | 21c31f62bca976076b851d01104327152035e8d4 /libguile/vectors.c | |
parent | b8bc86bce147cf280ca2a60d36c8b6493cbf11e8 (diff) | |
parent | 24dd9f6fe1449fa4de81d95ca659283c15e16931 (diff) | |
download | guile-2aed2667fce5ccb115667a36ffd368c4c3b6e9f4.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/expand.c
libguile/hashtab.c
libguile/ports.c
libguile/vectors.c
libguile/weaks.c
module/language/ecmascript/compile-tree-il.scm
module/language/tree-il/effects.scm
module/language/tree-il/fix-letrec.scm
module/language/tree-il/peval.scm
test-suite/tests/peval.test
Diffstat (limited to 'libguile/vectors.c')
-rw-r--r-- | libguile/vectors.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libguile/vectors.c b/libguile/vectors.c index 1640725e5..920ead10e 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - * +/* Copyright (C) 1995,1996,1998,1999,2000,2001, 2006, 2008, 2009, 2010, + * 2011, 2012 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 |