summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
Commit message (Expand)AuthorAge
* Follow commenting conventions.Stefan Monnier2009-01-31
* Add 2009 to copyright years.Glenn Morris2009-01-05
* * align.el:Lute Kamstra2008-12-03
* Remove unnecessary eval-when-compiles and eval-and-compiles.Glenn Morris2008-06-07
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-06
* Simplify compilation requirements.Glenn Morris2008-05-03
* Fix up comment convention on the arch-tag lines.Stefan Monnier2008-04-10
* 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-04
* Merge from emacs--rel--22Miles Bader2008-01-08
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-07
* | Load ediff-*.el files silently.Glenn Morris2007-11-27
|/
* Switch license to GPLv3 or later.Glenn Morris2007-07-25
* Add 2007 to copyright years.Glenn Morris2007-01-21
* (ediff-combination-pattern): Fix typo in docstring.Juanma Barranquero2006-12-11
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-19
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-06
* 2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-04
* 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-10-06
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-06
* Update FSF's address.Lute Kamstra2005-07-04
* Add arch taglinesMiles Bader2003-09-01
* Trailing whitespace deleted.Juanma Barranquero2003-02-04
* 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-01-08
* Doc fix.Pavel Janík2001-12-20
* Some fixes to follow coding conventions.Pavel Janík2001-07-16
* (state-or-merge): Defvar when compiling.Dave Love2000-11-10
* 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-10-29
* *** empty log message ***Michael Kifer1999-11-25
* *** empty log message ***Michael Kifer1999-11-01
* new versionMichael Kifer1997-11-01
* new versionMichael Kifer1997-09-30
* new versionMichael Kifer1997-07-31
* new versionMichael Kifer1997-07-17
* new versionMichael Kifer1997-05-31
* *** empty log message ***Michael Kifer1996-09-20
* *** empty log message ***Michael Kifer1996-06-22
* *** empty log message ***Michael Kifer1996-02-16
* Update FSF's address.Erik Naggum1996-01-14
* Comment fixes.Karl Heuer1996-01-05
* Moved defsubsts up.Michael Kifer1995-10-14
* *** empty log message ***Michael Kifer1995-10-06
* Converted xemacs *screen* nomenclature to *frame*.Karl Heuer1995-06-09
* Update copyright.Karl Heuer1995-04-07
* Initial revisionKarl Heuer1995-03-16
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 07:53:02 +0000