summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
AgeCommit message (Expand)Author
2010-01-13Add 2010 to copyright years.Glenn Morris
2009-09-13Replace empty `let's with `progn'.Glenn Morris
2009-08-152009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer
2009-01-31Follow commenting conventions.Stefan Monnier
2009-01-05Add 2009 to copyright years.Glenn Morris
2008-12-03* align.el:Lute Kamstra
2008-06-07Remove unnecessary eval-when-compiles and eval-and-compiles.Glenn Morris
2008-05-06Switch to recommended form of GPLv3 permissions notice.Glenn Morris
2008-05-03Simplify compilation requirements.Glenn Morris
2008-04-10Fix up comment convention on the arch-tag lines.Stefan Monnier
2008-04-042008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer
2008-01-08Merge from emacs--rel--22Miles Bader
2008-01-07Add 2008 to copyright years.Glenn Morris
2007-11-27Load ediff-*.el files silently.Glenn Morris
2007-07-25Switch license to GPLv3 or later.Glenn Morris
2007-01-21Add 2007 to copyright years.Glenn Morris
2006-12-11(ediff-combination-pattern): Fix typo in docstring.Juanma Barranquero
2006-02-192006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer
2006-02-06Update years in copyright notice; nfc.Thien-Thi Nguyen
2005-11-042005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer
2005-10-062005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer
2005-08-06Update years in copyright notice; nfc.Thien-Thi Nguyen
2005-07-04Update FSF's address.Lute Kamstra
2003-09-01Add arch taglinesMiles Bader
2003-02-04Trailing whitespace deleted.Juanma Barranquero
2002-01-082002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer
2001-12-20Doc fix.Pavel Janík
2001-07-16Some fixes to follow coding conventions.Pavel Janík
2000-11-10(state-or-merge): Defvar when compiling.Dave Love
2000-10-292000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer
1999-11-25*** empty log message ***Michael Kifer
1999-11-01*** empty log message ***Michael Kifer
1997-11-01new versionMichael Kifer
1997-09-30new versionMichael Kifer
1997-07-31new versionMichael Kifer
1997-07-17new versionMichael Kifer
1997-05-31new versionMichael Kifer
1996-09-20*** empty log message ***Michael Kifer
1996-06-22*** empty log message ***Michael Kifer
1996-02-16*** empty log message ***Michael Kifer
1996-01-14Update FSF's address.Erik Naggum
1996-01-05Comment fixes.Karl Heuer
1995-10-14Moved defsubsts up.Michael Kifer
1995-10-06*** empty log message ***Michael Kifer
1995-06-09Converted xemacs *screen* nomenclature to *frame*.Karl Heuer
1995-04-07Update copyright.Karl Heuer
1995-03-16Initial revisionKarl Heuer
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-24 19:29:56 +0000