diff options
| author | Miles Bader <miles@gnu.org> | 2006-01-16 08:37:27 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-01-16 08:37:27 +0000 |
| commit | 53ea3ae42129c50159f048ac638c36e294f80834 (patch) | |
| tree | 382391a73c6326e55970f494905b8222f2aaa5fb /src/category.c | |
| parent | 9d8d540ccb180fdbda1e3cbd4fc9042705ddb874 (diff) | |
| parent | a9c82e5f57e27d55c2c68181890eb435eb653c14 (diff) | |
| download | emacs-53ea3ae42129c50159f048ac638c36e294f80834.tar.gz | |
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.
Diffstat (limited to 'src/category.c')
| -rw-r--r-- | src/category.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/category.c b/src/category.c index cd1be5a8da0..3f4a9dd83f4 100644 --- a/src/category.c +++ b/src/category.c @@ -1,6 +1,8 @@ /* GNU Emacs routines to deal with category tables. - Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. - Licensed to the Free Software Foundation. + Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 1998, 1999 + 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 |