Merge from emacs--devo--0

[gnu-emacs] / src / charset.h

diff --git a/src/charset.h b/src/charset.h
index a06c3a1b094656104e4cafbeaa8b53458d64baa9..25ccaf9d324a8e1f6af6d39c250028d669987cd3 100644 (file)
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,7 +1,9 @@
 /* Header for charset handler.
-   Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN.
-     Licensed to the Free Software Foundation.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005 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