index
:
packy/emacs
master
Unnamed repository; edit this file 'description' to name the repository.
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
lisp
/
ediff-merg.el
Age
Commit message (
Expand
)
Author
2010-01-13
Add 2010 to copyright years.
Glenn Morris
2009-09-13
Replace empty `let's with `progn'.
Glenn Morris
2009-08-15
2009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer
2009-01-31
Follow commenting conventions.
Stefan Monnier
2009-01-05
Add 2009 to copyright years.
Glenn Morris
2008-12-03
* align.el:
Lute Kamstra
2008-06-07
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris
2008-05-06
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris
2008-05-03
Simplify compilation requirements.
Glenn Morris
2008-04-10
Fix up comment convention on the arch-tag lines.
Stefan Monnier
2008-04-04
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer
2008-01-08
Merge from emacs--rel--22
Miles Bader
2008-01-07
Add 2008 to copyright years.
Glenn Morris
2007-11-27
Load ediff-*.el files silently.
Glenn Morris
2007-07-25
Switch license to GPLv3 or later.
Glenn Morris
2007-01-21
Add 2007 to copyright years.
Glenn Morris
2006-12-11
(ediff-combination-pattern): Fix typo in docstring.
Juanma Barranquero
2006-02-19
2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer
2006-02-06
Update years in copyright notice; nfc.
Thien-Thi Nguyen
2005-11-04
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer
2005-10-06
2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer
2005-08-06
Update years in copyright notice; nfc.
Thien-Thi Nguyen
2005-07-04
Update FSF's address.
Lute Kamstra
2003-09-01
Add arch taglines
Miles Bader
2003-02-04
Trailing whitespace deleted.
Juanma Barranquero
2002-01-08
2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
Michael Kifer
2001-12-20
Doc fix.
Pavel Janík
2001-07-16
Some fixes to follow coding conventions.
Pavel Janík
2000-11-10
(state-or-merge): Defvar when compiling.
Dave Love
2000-10-29
2000-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-01
new version
Michael Kifer
1997-09-30
new version
Michael Kifer
1997-07-31
new version
Michael Kifer
1997-07-17
new version
Michael Kifer
1997-05-31
new version
Michael 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-14
Update FSF's address.
Erik Naggum
1996-01-05
Comment fixes.
Karl Heuer
1995-10-14
Moved defsubsts up.
Michael Kifer
1995-10-06
*** empty log message ***
Michael Kifer
1995-06-09
Converted xemacs *screen* nomenclature to *frame*.
Karl Heuer
1995-04-07
Update copyright.
Karl Heuer
1995-03-16
Initial revision
Karl Heuer