diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:26:54 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2007-09-12 16:26:54 +0000 |
commit | 83584a7af898dd93c48600fe850d150c51b10899 (patch) | |
tree | 0affa8ffee374ab83e40501d8d8967a03569c44d /libc/locale/programs/charmap.h | |
parent | 04b4d23592609edcd19fd5a461bbe6d3cc677b5b (diff) |
Merge changes between r2424 and r3467 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@3468 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/locale/programs/charmap.h')
-rw-r--r-- | libc/locale/programs/charmap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/locale/programs/charmap.h b/libc/locale/programs/charmap.h index fd711f2d1..11fddd760 100644 --- a/libc/locale/programs/charmap.h +++ b/libc/locale/programs/charmap.h @@ -3,8 +3,9 @@ Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. + it under the terms of the GNU General Public License as published + by the Free Software Foundation; version 2 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |