diff options
| author | Miles Bader | 2006-02-08 04:26:44 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-02-08 04:26:44 +0000 |
| commit | 380874900ca183ec2fdce91949d841328852d7a8 (patch) | |
| tree | 6918a4182f8657251e83223511aa7827fb8820ed /src/disptab.h | |
| parent | 72b464afc12a7532fc8555352db04c65647c15ae (diff) | |
| parent | c96ec15a58817ac97db5348187e2d8695f609cb5 (diff) | |
| download | emacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz emacs-380874900ca183ec2fdce91949d841328852d7a8.zip | |
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/disptab.h')
| -rw-r--r-- | src/disptab.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/disptab.h b/src/disptab.h index ed7ec8597a9..0d7a03c43ba 100644 --- a/src/disptab.h +++ b/src/disptab.h | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* Things for GLYPHS and glyph tables. | 1 | /* Things for GLYPHS and glyph tables. |
| 2 | Copyright (C) 1993, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | 2 | Copyright (C) 1993, 2002, 2003, 2004, 2005, |
| 3 | 2006 Free Software Foundation, Inc. | ||
| 3 | 4 | ||
| 4 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 5 | 6 | ||