diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-27 21:42:03 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-27 21:42:03 +0200 |
| commit | db6f1f397f45ccd3c11d16352ed46a9c1eae3442 (patch) | |
| tree | e0b9334e2637f17696c796ac13b2c39294bf9233 /lib/striconveha.c | |
| parent | 0250cb64565a7d5238bbc751225d4b0236ef8316 (diff) | |
| parent | 6b73edd95d603e27d55d4905134ac1327d426534 (diff) | |
Merge tag 'upstream/0.9.7'
Upstream version 0.9.7
Diffstat (limited to 'lib/striconveha.c')
| -rw-r--r-- | lib/striconveha.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/lib/striconveha.c b/lib/striconveha.c index d39a7db4..8b23b264 100644 --- a/lib/striconveha.c +++ b/lib/striconveha.c @@ -1,18 +1,27 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007, 2009-2016 Free Software Foundation, Inc. Written by Bruno Haible. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This program is free software: you can redistribute it and/or + modify it under the terms of either: + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at your + option) any later version. + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + or both in parallel, as here. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. + GNU General Public License for more details. - You should have received a copy of the GNU Lesser General Public License + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> |