diff options
| author | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:25:07 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2012-01-30 18:25:07 +0100 |
| commit | 855db1905d56efcdf91ae51a9e80990f79030eae (patch) | |
| tree | 9c918dba899ddae458147ce1095018fcbdec18b0 /m4/libunistring-base.m4 | |
| parent | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (diff) | |
| parent | 9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a (diff) | |
Merge commit '9b0975f1dc41ddd10d81fb5b0965b9e9a54ef37a'
Conflicts:
libguile/foreign.c
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
Diffstat (limited to 'm4/libunistring-base.m4')
| -rw-r--r-- | m4/libunistring-base.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index 9831448a2..d91c42b9f 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. |