diff options
| author | Karoly Lorentey <[email protected]> | 2007-01-29 22:21:19 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2007-01-29 22:21:19 +0000 |
| commit | 93afd0f1d463bec0fc8d3127c1d34ccaa4dbe99b (patch) | |
| tree | 6e4e3bec20b8c65eb1f78b0ad302fa6c1977d355 /lisp/ediff-wind.el | |
| parent | 38db5c8d522cc1faa8190e77dbc932a5560e6aad (diff) | |
| parent | 5c4a60523827062803ab9a55b4325358225d66bf (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-599
Merge from erc--main--0
* [email protected]/emacs--devo--0--patch-600
Merge from erc--main--0
* [email protected]/emacs--devo--0--patch-601
Update from CVS
* [email protected]/emacs--devo--0--patch-602
Update from CVS
* [email protected]/emacs--devo--0--patch-603
Update from CVS
* [email protected]/emacs--devo--0--patch-604
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-605
Update from CVS
* [email protected]/emacs--devo--0--patch-606
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-607
Update from CVS
* [email protected]/emacs--devo--0--patch-608
Update from CVS
* [email protected]/emacs--devo--0--patch-609
Update from CVS
* [email protected]/emacs--devo--0--patch-610
Update from CVS
* [email protected]/emacs--devo--0--patch-611
Update from CVS
* [email protected]/emacs--devo--0--patch-612
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-613
Update from CVS
* [email protected]/emacs--devo--0--patch-614
Make byte compiler correctly write circular constants
* [email protected]/emacs--devo--0--patch-615
Update from CVS
* [email protected]/emacs--devo--0--patch-616
Update from CVS
* [email protected]/emacs--devo--0--patch-617
Update from CVS
* [email protected]/emacs--devo--0--patch-618
Update from CVS
* [email protected]/gnus--rel--5.10--patch-192
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-193
Update from CVS
* [email protected]/gnus--rel--5.10--patch-194
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-195
Update from CVS
* [email protected]/gnus--rel--5.10--patch-196
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-594
Diffstat (limited to 'lisp/ediff-wind.el')
| -rw-r--r-- | lisp/ediff-wind.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 7d9daa6aac..c9162129e0 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -1,7 +1,7 @@ ;;; ediff-wind.el --- window manipulation utilities ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007 Free Software Foundation, Inc. ;; Author: Michael Kifer <[email protected]> |