Mercurial > emacs
comparison lisp/ediff-mult.el @ 90224:2d92f5c9d6ae
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 514-518)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 104-105)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 26 Aug 2005 09:51:52 +0000 |
parents | fbb2bea03df9 41bb365f41c4 |
children | ee12d75eb214 |
comparison
equal
deleted
inserted
replaced
90223:edf295560b5a | 90224:2d92f5c9d6ae |
---|---|
1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff | 1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff |
2 | 2 |
3 ;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02, 05 Free Software Foundation, Inc. | 3 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4 ;; 2003, 2004, 2005 Free Software Foundation, Inc. | |
4 | 5 |
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
6 | 7 |
7 ;; This file is part of GNU Emacs. | 8 ;; This file is part of GNU Emacs. |
8 | 9 |