Mercurial > emacs
diff src/fontset.h @ 90261:7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 16 Jan 2006 08:37:27 +0000 |
parents | 2d92f5c9d6ae 547f2b420666 |
children | c5406394f567 |
line wrap: on
line diff
--- a/src/fontset.h Mon Jan 16 06:59:21 2006 +0000 +++ b/src/fontset.h Mon Jan 16 08:37:27 2006 +0000 @@ -1,10 +1,11 @@ /* Header for fontset handler. - Copyright (C) 1995, 1997, 2000 Electrotechnical Laboratory, JAPAN. - Licensed to the Free Software Foundation. + Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000 + 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) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Emacs.