Merge commit 'upstream/3.3.0'

[debian/amanda] / gnulib / localcharset.h

diff --git a/gnulib/localcharset.h b/gnulib/localcharset.h
index 5030210d113ec0854e090eff7d76bd0055eaf6d9..899b3bae767e22c57c34460df9b8339331788e6f 100644 (file)
--- a/gnulib/localcharset.h
+++ b/gnulib/localcharset.h
@@ -1,10 +1,10 @@
 /* Determine a canonical name for the current locale's character encoding.
 /* Determine a canonical name for the current locale's character encoding.

-   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2010 Free Software Foundation, Inc.

    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    This file is part of the GNU CHARSET Library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,