log lisp/ediff-merg.el @ 112262:e4c00899294b

age author description
Sun, 02 Jan 2011 15:50:46 -0800 Glenn Morris Add 2011 to FSF/AIST copyright years.
Wed, 13 Jan 2010 00:35:10 -0800 Glenn Morris Add 2010 to copyright years.
Sun, 13 Sep 2009 02:14:25 +0000 Glenn Morris Replace empty `let's with `progn'.
Sat, 15 Aug 2009 05:57:08 +0000 Michael Kifer 2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Sat, 31 Jan 2009 22:10:22 +0000 Stefan Monnier Follow commenting conventions.
Mon, 05 Jan 2009 03:18:22 +0000 Glenn Morris Add 2009 to copyright years.
Wed, 03 Dec 2008 05:48:14 +0000 Lute Kamstra * align.el:
Sat, 07 Jun 2008 02:44:10 +0000 Glenn Morris Remove unnecessary eval-when-compiles and eval-and-compiles.
Tue, 06 May 2008 07:58:00 +0000 Glenn Morris Switch to recommended form of GPLv3 permissions notice.
Sat, 03 May 2008 20:53:30 +0000 Glenn Morris Simplify compilation requirements.
Thu, 10 Apr 2008 14:10:46 +0000 Stefan Monnier Fix up comment convention on the arch-tag lines.
Fri, 04 Apr 2008 07:51:27 +0000 Michael Kifer 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Wed, 09 Jan 2008 01:21:15 +0000 Miles Bader Merge from emacs--devo--0
Thu, 06 Dec 2007 09:51:45 +0000 Miles Bader Merge from emacs--devo--0
Fri, 27 Jul 2007 10:52:18 +0000 Miles Bader Merge from emacs--devo--0
Fri, 26 Jan 2007 06:16:11 +0000 Miles Bader Merge from emacs--devo--0
Sat, 16 Dec 2006 01:29:26 +0000 Miles Bader Merge from emacs--devo--0
Wed, 22 Feb 2006 06:54:10 +0000 Miles Bader Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
Wed, 08 Feb 2006 04:26:44 +0000 Miles Bader Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Mon, 16 Jan 2006 08:37:27 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Fri, 07 Oct 2005 07:15:40 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88
Fri, 26 Aug 2005 09:51:52 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
Thu, 07 Jul 2005 12:43:14 +0000 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Fri, 16 Apr 2004 12:51:06 +0000 Kenichi Handa Sync to HEAD
Mon, 16 Jan 2006 00:03:54 +0000 Henrik Enberg sync with trunk
Mon, 08 Sep 2003 11:56:09 +0000 Kenichi Handa New directory
Tue, 08 Jan 2008 20:46:54 +0000 Miles Bader Merge from emacs--rel--22
Tue, 27 Nov 2007 03:59:04 +0000 Glenn Morris Load ediff-*.el files silently.
Mon, 07 Jan 2008 02:45:14 +0000 Glenn Morris Add 2008 to copyright years.
Wed, 25 Jul 2007 04:47:42 +0000 Glenn Morris Switch license to GPLv3 or later.
Sun, 21 Jan 2007 03:53:13 +0000 Glenn Morris Add 2007 to copyright years.
Mon, 11 Dec 2006 01:28:02 +0000 Juanma Barranquero (ediff-combination-pattern): Fix typo in docstring.
Sun, 19 Feb 2006 03:16:45 +0000 Michael Kifer 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Mon, 06 Feb 2006 15:23:23 +0000 Thien-Thi Nguyen Update years in copyright notice; nfc.
Fri, 04 Nov 2005 05:40:03 +0000 Michael Kifer 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Thu, 06 Oct 2005 00:09:49 +0000 Michael Kifer 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Sat, 06 Aug 2005 22:13:43 +0000 Thien-Thi Nguyen Update years in copyright notice; nfc.
Mon, 04 Jul 2005 23:32:44 +0000 Lute Kamstra Update FSF's address.
Mon, 01 Sep 2003 15:45:59 +0000 Miles Bader Add arch taglines
Tue, 04 Feb 2003 11:26:42 +0000 Juanma Barranquero Trailing whitespace deleted.
Tue, 08 Jan 2002 04:36:01 +0000 Michael Kifer 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Thu, 20 Dec 2001 19:01:00 +0000 Pavel Jank Doc fix.
Mon, 16 Jul 2001 07:46:48 +0000 Pavel Jank Some fixes to follow coding conventions.
Fri, 10 Nov 2000 22:36:26 +0000 Dave Love (state-or-merge): Defvar when compiling.
Sun, 29 Oct 2000 04:56:45 +0000 Michael Kifer 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
Thu, 25 Nov 1999 04:34:23 +0000 Michael Kifer *** empty log message ***
Mon, 01 Nov 1999 07:16:15 +0000 Michael Kifer *** empty log message ***
Sat, 01 Nov 1997 01:46:51 +0000 Michael Kifer new version
Tue, 30 Sep 1997 01:13:53 +0000 Michael Kifer new version
Thu, 31 Jul 1997 04:04:23 +0000 Michael Kifer new version
Thu, 17 Jul 1997 19:37:07 +0000 Michael Kifer new version
Sat, 31 May 1997 01:10:39 +0000 Michael Kifer new version
Fri, 20 Sep 1996 01:10:05 +0000 Michael Kifer *** empty log message ***
Sat, 22 Jun 1996 01:54:34 +0000 Michael Kifer *** empty log message ***
Fri, 16 Feb 1996 06:36:35 +0000 Michael Kifer *** empty log message ***
Sun, 14 Jan 1996 07:34:30 +0000 Erik Naggum Update FSF's address.
Fri, 05 Jan 1996 22:21:28 +0000 Karl Heuer Comment fixes.
Sat, 14 Oct 1995 03:14:11 +0000 Michael Kifer Moved defsubsts up.
Fri, 06 Oct 1995 00:56:53 +0000 Michael Kifer *** empty log message ***
Fri, 09 Jun 1995 14:38:56 +0000 Karl Heuer Converted xemacs *screen* nomenclature to *frame*.