diff options
| author | Miles Bader | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /src/coding.h | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/coding.h b/src/coding.h index 0f8d2b0ed7b..f33e8335752 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | /* Header for coding system handler. | 1 | /* Header for coding system handler. |
| 2 | Copyright (C) 2002, 2003, 2004, 2005, | 2 | Copyright (C) 2001, 2002, 2003, 2004, 2005, |
| 3 | 2006 Free Software Foundation, Inc. | 3 | 2006, 2007 Free Software Foundation, Inc. |
| 4 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, | 4 | Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
| 5 | 2005, 2006 | 5 | 2005, 2006, 2007 |
| 6 | National Institute of Advanced Industrial Science and Technology (AIST) | 6 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 7 | Registration Number H14PRO021 | 7 | Registration Number H14PRO021 |
| 8 | Copyright (C) 2003 | 8 | Copyright (C) 2003 |