diff options
| author | Karoly Lorentey | 2005-12-26 03:16:59 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-12-26 03:16:59 +0000 |
| commit | feba0cd6405ebb80af743e2f978442d9c837bcd2 (patch) | |
| tree | 1cb964aa641bee514d9cda2eafe27a0a97e65ad1 /src/fontset.c | |
| parent | 30663b475e57197c9896a252e1d4ca31c579fa2b (diff) | |
| parent | 7a32e81fb608282314e27db21a00138aaa91f29a (diff) | |
| download | emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.tar.gz emacs-feba0cd6405ebb80af743e2f978442d9c837bcd2.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 677)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-677
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-463
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fontset.c b/src/fontset.c index 4529e6c2134..871ce9926f7 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | /* Fontset handler. | 1 | /* Fontset handler. |
| 2 | Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN. | ||
| 3 | Licensed to the Free Software Foundation. | ||
| 4 | Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | 2 | Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
| 3 | Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005 | ||
| 4 | National Institute of Advanced Industrial Science and Technology (AIST) | ||
| 5 | Registration Number H14PRO021 | ||
| 5 | 6 | ||
| 6 | This file is part of GNU Emacs. | 7 | This file is part of GNU Emacs. |
| 7 | 8 | ||