Merge from emacs--devo--0

[gnu-emacs] / src / charset.h

diff --git a/src/charset.h b/src/charset.h
index f95190689483a8c6d046d48a02915b9d04770992..25ccaf9d324a8e1f6af6d39c250028d669987cd3 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,7 +1,9 @@
 /* Header for charset handler.
 /* Header for charset handler.

-   Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
-     Licensed to the Free Software Foundation.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021

    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
    Copyright (C) 2003
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009


@@ -20,8 +22,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to

-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 #ifndef EMACS_CHARSET_H
 #define EMACS_CHARSET_H
 
 #ifndef EMACS_CHARSET_H
 #define EMACS_CHARSET_H