Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index e3bb1ced2f4d63c0b6d138e371fdc7318a9f85bc..4529e6c21343bcd66c5319ef3960398ca60925ac 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,7 +1,7 @@
 /* Fontset handler.
-   Copyright (C) 2004  Free Software Foundation, Inc.
    Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.