Mercurial > emacs
diff lisp/language/english.el @ 90737:95d0cdf160ea
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 26 Jan 2007 06:16:11 +0000 |
parents | 6588c6259dfb e3694f1cb928 |
children | f55f9811f5d7 |
line wrap: on
line diff
--- a/lisp/language/english.el Fri Jan 26 02:30:28 2007 +0000 +++ b/lisp/language/english.el Fri Jan 26 06:16:11 2007 +0000 @@ -1,8 +1,8 @@ ;;; english.el --- support for English -*- no-byte-compile: t -*- -;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003