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 | 6cc3bec9030c1e0e863be83be59cc710ad95b332 (patch) | |
tree | ac9827bc441c985371d4cec037adc556dc009c6f /lisp/textmodes/two-column.el | |
parent | c9dcf1274c41a43d8f321821b52275938806c71c (diff) | |
parent | c86d56a52995ed9b656b079a7f9aef269792ffe1 (diff) | |
download | emacs-6cc3bec9030c1e0e863be83be59cc710ad95b332.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/textmodes/two-column.el')
-rw-r--r-- | lisp/textmodes/two-column.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index 958ef179b26..9de1a078d13 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -1,6 +1,6 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> |