diff options
| author | Miles Bader | 2005-08-26 09:51:52 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-08-26 09:51:52 +0000 |
| commit | d4cccb140682cfa548a8658f905764ceb4a38cb2 (patch) | |
| tree | 5230af18ee25b37efed50fa38cac1eefb47d03fc /src/composite.h | |
| parent | 5e10f34207ff594cd6570928bc0292a7b53297b8 (diff) | |
| parent | f3f01d5df3156fb408b43da0c670796c37ed084f (diff) | |
| download | emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.tar.gz emacs-d4cccb140682cfa548a8658f905764ceb4a38cb2.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h index 550115edd44..fe931a579ae 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -1,10 +1,10 @@ | |||
| 1 | /* Header for composite sequence handler. | 1 | /* Header for composite sequence handler. |
| 2 | Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. | 2 | Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. |
| 3 | Licensed to the Free Software Foundation. | 3 | Licensed to the Free Software Foundation. |
| 4 | Copyright (C) 2001 Free Software Foundation, Inc. | ||
| 5 | Copyright (C) 2003 | 4 | Copyright (C) 2003 |
| 6 | National Institute of Advanced Industrial Science and Technology (AIST) | 5 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 7 | Registration Number H13PRO009 | 6 | Registration Number H13PRO009 |
| 7 | Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | ||
| 8 | 8 | ||
| 9 | This file is part of GNU Emacs. | 9 | This file is part of GNU Emacs. |
| 10 | 10 | ||