summaryrefslogtreecommitdiff
path: root/libguile/__scm.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-10 00:41:42 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-10 00:41:42 +0100
commit91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch)
treece023c92c0d9bf895c1265b107b270c35ba59b94 /libguile/__scm.h
parent0bdd43515eb3c62839512181cf33e5aea383e661 (diff)
parent0e947e1d14597651c5762a4209225c472bdaef45 (diff)
downloadguile-91ee7515da0bad91330ce5c87b250d6cf12a2789.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: libguile/__scm.h libguile/array-map.c libguile/procprop.c libguile/tags.h module/ice-9/deprecated.scm module/ice-9/psyntax-pp.scm module/ice-9/psyntax.scm test-suite/standalone/test-num2integral.c test-suite/tests/regexp.test
Diffstat (limited to 'libguile/__scm.h')
-rw-r--r--libguile/__scm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/__scm.h b/libguile/__scm.h
index ee73855c6..d0a421371 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -4,7 +4,7 @@
#define SCM___SCM_H
/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2006,
- * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * 2007, 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