summaryrefslogtreecommitdiff
path: root/lisp/ediff-wind.el
Commit message (Expand)AuthorAgeFilesLines
* Move version control related files to the "vc" subdirectory.Juri Linkov2010-06-111-1313/+0
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
* * ediff-wind.el (ediff-make-wide-display): Fix typo in frame parameterChong Yidong2009-04-161-1/+1
* Follow commenting conventions.Stefan Monnier2009-01-311-5/+5
* Add 2009 to copyright years.Glenn Morris2009-01-051-1/+1
* * align.el:Lute Kamstra2008-12-031-8/+8
* 2008-11-16 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-11-161-0/+4
* Switch to recommended form of GPLv3 permissions notice.Glenn Morris2008-05-061-6/+4
* Simplify compilation requirements.Glenn Morris2008-05-031-6/+1
* (ediff-split-window-function, ediff-merge-split-window-function):Reiner Steib2008-04-121-2/+8
* Fix up comment convention on the arch-tag lines.Stefan Monnier2008-04-101-1/+1
* 2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-061-5/+3
* 2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-04-041-40/+35
* Expand all ediff-cond-compile-for-xemacs-or-emacs calls to a featurep test.Glenn Morris2008-03-051-71/+45
* 2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-01-101-3/+7
* 2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2008-01-091-2/+3
* Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
|\
| * Add 2008 to copyright years.Glenn Morris2008-01-071-1/+1
* | Load ediff-*.el files silently.Glenn Morris2007-11-271-3/+7
* | (ediff-window-setup-function): Fix typo in docstring.Juanma Barranquero2007-11-151-1/+1
* | * ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.Dan Nicolaescu2007-11-091-9/+8
* | Merge from emacs--devo--0Miles Bader2007-07-311-1/+1
|\ \ | |/
| * Switch license to GPLv3 or later.Glenn Morris2007-07-251-1/+1
* | Merged from emacs@sv.gnu.orgKaroly Lorentey2007-01-291-1/+1
|\ \ | |/
| * Add 2007 to copyright years.Glenn Morris2007-01-211-1/+1
* | Merged from emacs@sv.gnu.orgKaroly Lorentey2006-06-271-0/+2
|\ \ | |/
| * 2006-06-18 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-06-181-0/+2
* | Fix compilation error in ediff-wind.el. D'oh.Karoly Lorentey2006-03-121-1/+1
* | Fix ediff problems. (Reported by Dan Nicolaescu.)Karoly Lorentey2006-03-121-9/+16
|/
* 2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2006-02-191-1/+3
* Update years in copyright notice; nfc.Thien-Thi Nguyen2006-02-061-1/+1
* 2005-11-29 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-291-3/+5
* 2005-11-25 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-11-251-3/+1
* 2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2005-10-061-2/+3
* Update years in copyright notice; nfc.Thien-Thi Nguyen2005-08-061-1/+2
* Update FSF's address.Lute Kamstra2005-07-041-2/+2
* (ediff-window): Finish `defgroup' description with period.Juanma Barranquero2005-07-041-1/+1
* Add arch taglinesMiles Bader2003-09-011-0/+1
* Trailing whitespace deleted.Juanma Barranquero2003-02-041-93/+93
* 2002-10-27 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-10-281-0/+1
* 2002-10-12 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-10-121-27/+25
* (ediff-window-setup-function): Extend type declaration.Markus Rost2002-07-261-1/+3
* 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-02-101-2/+2
* 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>Michael Kifer2002-01-081-42/+62
* 2001-12-24 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-12-241-2/+4
* Some fixes to follow coding conventions.Pavel Janík2001-07-161-0/+2
* 2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2001-03-171-1/+1
* * ediff-diff.el: Moved variables around to have it compile under NT.Michael Kifer2000-11-241-4/+1
* (ediff-control-frame-parameters): ZeroDave Love2000-11-081-0/+1
* 2000-10-29 Michael Kifer <kifer@cs.sunysb.edu>Michael Kifer2000-10-301-2/+6
View Lorry Controller Status