diff options
| author | Miles Bader | 2006-12-16 01:29:26 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-12-16 01:29:26 +0000 |
| commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
| tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /src/coding.h | |
| parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/coding.h b/src/coding.h index 93375d2c2eb..0f8d2b0ed7b 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | /* Header for coding system handler. | 1 | /* Header for coding system handler. |
| 2 | Copyright (C) 2002, 2003, 2004, 2005, | 2 | Copyright (C) 2002, 2003, 2004, 2005, |
| 3 | 2006 Free Software Foundation, Inc. | 3 | 2006 Free Software Foundation, Inc. |
| 4 | Copyright (C) 1995, 1997, 1998, 2000 | 4 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 5 | 2005, 2006 | ||
| 5 | National Institute of Advanced Industrial Science and Technology (AIST) | 6 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 6 | Registration Number H14PRO021 | 7 | Registration Number H14PRO021 |
| 7 | Copyright (C) 2003 | 8 | Copyright (C) 2003 |