diff options
author | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /lisp/language/cyrillic.el | |
parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz |
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 'lisp/language/cyrillic.el')
-rw-r--r-- | lisp/language/cyrillic.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el index 3b35bb2c1a2..110f07e14ea 100644 --- a/lisp/language/cyrillic.el +++ b/lisp/language/cyrillic.el @@ -1,7 +1,9 @@ ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2001, 2002, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003 |