log lisp/ediff-merg.el @ 91213:aaf0103455b0

age author description
2007-12-06 Miles Bader Merge from emacs--devo--0
2007-07-27 Miles Bader Merge from emacs--devo--0
2007-01-26 Miles Bader Merge from emacs--devo--0
2006-12-16 Miles Bader Merge from emacs--devo--0
2006-02-22 Miles Bader Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
2006-02-08 Miles Bader Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
2006-01-16 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
2005-10-07 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88
2005-08-26 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
2005-07-07 Miles Bader Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
2004-04-16 Kenichi Handa Sync to HEAD
2006-01-16 Henrik Enberg sync with trunk
2003-09-08 Kenichi Handa New directory
2008-01-08 Miles Bader Merge from emacs--rel--22
2007-11-27 Glenn Morris Load ediff-*.el files silently.
2008-01-07 Glenn Morris Add 2008 to copyright years.
2007-07-25 Glenn Morris Switch license to GPLv3 or later.
2007-01-21 Glenn Morris Add 2007 to copyright years.
2006-12-11 Juanma Barranquero (ediff-combination-pattern): Fix typo in docstring.
2006-02-19 Michael Kifer 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
2006-02-06 Thien-Thi Nguyen Update years in copyright notice; nfc.
2005-11-04 Michael Kifer 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
2005-10-06 Michael Kifer 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
2005-08-06 Thien-Thi Nguyen Update years in copyright notice; nfc.
2005-07-04 Lute Kamstra Update FSF's address.
2003-09-01 Miles Bader Add arch taglines
2003-02-04 Juanma Barranquero Trailing whitespace deleted.
2002-01-08 Michael Kifer 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
2001-12-20 Pavel Janík Doc fix.
2001-07-16 Pavel Janík Some fixes to follow coding conventions.
2000-11-10 Dave Love (state-or-merge): Defvar when compiling.
2000-10-29 Michael Kifer 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>
1999-11-25 Michael Kifer *** empty log message ***
1999-11-01 Michael Kifer *** empty log message ***
1997-11-01 Michael Kifer new version
1997-09-30 Michael Kifer new version
1997-07-31 Michael Kifer new version
1997-07-17 Michael Kifer new version
1997-05-31 Michael Kifer new version
1996-09-20 Michael Kifer *** empty log message ***
1996-06-22 Michael Kifer *** empty log message ***
1996-02-16 Michael Kifer *** empty log message ***
1996-01-14 Erik Naggum Update FSF's address.
1996-01-05 Karl Heuer Comment fixes.
1995-10-14 Michael Kifer Moved defsubsts up.
1995-10-06 Michael Kifer *** empty log message ***
1995-06-09 Karl Heuer Converted xemacs *screen* nomenclature to *frame*.
1995-04-07 Karl Heuer Update copyright.
1995-03-16 Karl Heuer Initial revision