diff options
| author | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
| commit | 380874900ca183ec2fdce91949d841328852d7a8 (patch) | |
| tree | 6918a4182f8657251e83223511aa7827fb8820ed /src/fontset.h | |
| parent | 72b464afc12a7532fc8555352db04c65647c15ae (diff) | |
| parent | c96ec15a58817ac97db5348187e2d8695f609cb5 (diff) | |
| download | emacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 43-57)
- Update from CVS
- Merge from erc--emacs--0
- Make constrain-to-field notice overlays
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 18-21)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'src/fontset.h')
| -rw-r--r-- | src/fontset.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontset.h b/src/fontset.h index c3ef769d1ea..ec9552ef436 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,5 +1,6 @@ /* Header for fontset handler. - Copyright (C) 1998, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Copyright (C) 1995, 1997, 2000 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 |