diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-01-10 00:28:48 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-01-10 00:28:48 +0000 |
commit | 00ed3326c2fac75592e173e9d731452e9bb769ff (patch) | |
tree | 749aa90fd85da4971d09bc7cb69d79ac7e1ea580 /libc/locale/programs/locale.c | |
parent | 28c5710e0d8071ca674ea390549c1b9e969ccde2 (diff) |
Merge changes between r22062 and r22176 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22177 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale/programs/locale.c')
-rw-r--r-- | libc/locale/programs/locale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/locale/programs/locale.c b/libc/locale/programs/locale.c index 6bbd9d684..13e523495 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-2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1995-2013 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\ -"), "2012"); +"), "2013"); fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); } |