diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-03 21:57:20 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-01-03 21:57:20 +0000 |
| commit | 6fc1ece8240f262043817c8e50841e78b8ec057f (patch) | |
| tree | 44e769438af0582d1304eb02ee21e5136dbd336d /libc/locale | |
| parent | 6ffa8f2f3b013e11bfdb0bdfbe678218f2ad6af4 (diff) | |
Merge changes between r16431 and r16494 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@16495 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale')
| -rw-r--r-- | libc/locale/programs/locale.c | 4 | ||||
| -rw-r--r-- | libc/locale/programs/localedef.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/locale/programs/locale.c b/libc/locale/programs/locale.c index b1c0954e6..d23ba7307 100644 --- a/libc/locale/programs/locale.c +++ b/libc/locale/programs/locale.c @@ -1,5 +1,5 @@ /* Implementation of the locale program according to POSIX 9945-2. - Copyright (C) 1995-1997, 1999-2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -297,7 +297,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } diff --git a/libc/locale/programs/localedef.c b/libc/locale/programs/localedef.c index 0f5f9cc39..6c0eae28e 100644 --- a/libc/locale/programs/localedef.c +++ b/libc/locale/programs/localedef.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995-2008, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1995-2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1995. @@ -407,7 +407,7 @@ print_version (FILE *stream, struct argp_state *state) Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2011"); +"), "2012"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } |