Switch to recommended form of GPLv3 permissions notice.
[bpt/emacs.git] / lisp / ediff-merg.el
2008-05-06 Glenn MorrisSwitch to recommended form of GPLv3 permissions notice.
2008-05-04 Miles BaderMerge from emacs--rel--22
2008-05-03 Glenn MorrisSimplify compilation requirements.
2008-05-02 Miles BaderMerge from emacs--rel--22
2008-04-29 Miles BaderMerge from emacs--rel--22
2008-04-26 Miles BaderMerge from emacs--rel--22
2008-04-24 Miles BaderMerge from emacs--rel--22
2008-04-23 Miles BaderMerge from emacs--rel--22
2008-04-18 Miles BaderMerge from emacs--rel--22
2008-04-10 Stefan MonnierFix up comment convention on the arch-tag lines.
2008-04-05 Miles BaderMerge from emacs--rel--22
2008-04-04 Michael Kifer2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
2008-03-10 Miles BaderMerge from emacs--rel--22
2008-03-01 Miles BaderMerge from emacs--rel--22
2008-02-25 Miles BaderMerge from emacs--rel--22
2008-02-24 Miles BaderMerge from emacs--rel--22
2008-02-04 Miles BaderMerge from emacs--rel--22
2008-02-01 Miles BaderMerge from emacs--rel--22
2008-02-01 Miles BaderMerge from emacs--rel--22
2008-01-31 Miles BaderMerge from emacs--rel--22
2008-01-30 Miles BaderMerge from emacs--rel--22
2008-01-29 Miles BaderMerge from emacs--rel--22
2008-01-22 Miles BaderMerge from emacs--rel--22
2008-01-09 Miles BaderMerge from emacs--devo--0
2008-01-08 Miles BaderMerge from emacs--rel--22
2008-01-07 Glenn MorrisAdd 2008 to copyright years.
2008-01-02 Miles BaderMerge from emacs--rel--22, gnus--devo--0
2007-12-28 Miles BaderMerge from emacs--rel--22
2007-12-16 Miles BaderMerge from emacs--rel--22
2007-12-06 Miles BaderMerge from emacs--devo--0
2007-12-06 Miles BaderMerge from emacs--rel--22, gnus--devo--0
2007-12-06 Miles BaderMerge from emacs--rel--22
2007-11-27 Glenn MorrisLoad ediff-*.el files silently.
2007-07-31 Miles BaderMerge from emacs--devo--0
2007-07-27 Miles BaderMerge from emacs--devo--0
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-26 Miles BaderMerge from emacs--rel--22
2007-07-25 Glenn MorrisSwitch license to GPLv3 or later.
2007-01-29 Karoly LorenteyMerged from emacs@sv.gnu.org
2007-01-26 Miles BaderMerge from emacs--devo--0
2007-01-21 Glenn MorrisAdd 2007 to copyright years.
2007-01-01 Karoly LorenteyMerged from emacs@sv.gnu.org.
2006-12-16 Miles BaderMerge from emacs--devo--0
2006-12-11 Juanma Barranquero(ediff-combination-pattern): Fix typo in docstring.
2006-02-22 Miles BaderRevision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
2006-02-20 Karoly LorenteyMerged from emacs@sv.gnu.org
2006-02-19 Michael Kifer2006-02-19 Michael Kifer <kifer@cs.stonybrook.edu>
2006-02-12 Karoly LorenteyMerged from emacs@sv.gnu.org
2006-02-08 Miles BaderRevision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
2006-02-06 Thien-Thi NguyenUpdate years in copyright notice; nfc.
2006-01-16 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-11-07 Karoly LorenteyMerged from miles@gnu.org--gnu-2005 (patch 149-151...
2005-11-04 Michael Kifer2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu>
2005-10-12 Karoly LorenteyMerged from miles@gnu.org--gnu-2005 (patch 578-592)
2005-10-07 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-10-06 Michael Kifer2005-10-05 Michael Kifer <kifer@cs.stonybrook.edu>
2005-09-04 Karoly LorenteyMerged in changes from CVS trunk. Plus added lisp...
2005-08-26 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-08-06 Thien-Thi NguyenUpdate years in copyright notice; nfc.
2005-07-07 Miles BaderRevision: miles@gnu.org--gnu-2005/emacs--unicode--0...
2005-07-05 Karoly LorenteyMerged from miles@gnu.org--gnu-2005 (patch 469)
2005-07-04 Lute KamstraUpdate FSF's address.
2004-04-16 Kenichi HandaSync to HEAD
2003-09-08 Kenichi Handa*** empty log message ***
2003-09-08 Kenichi HandaNew directory
2003-09-01 Miles BaderAdd arch taglines
2003-02-04 Juanma BarranqueroTrailing whitespace deleted.
2002-01-08 Michael Kifer2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
2001-12-20 Pavel JaníkDoc fix.
2001-07-16 Pavel JaníkSome fixes to follow coding conventions.
2000-11-10 Dave Love(state-or-merge): Defvar when compiling.
2000-10-29 Michael Kifer2000-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 Kifernew version
1997-09-30 Michael Kifernew version
1997-07-31 Michael Kifernew version
1997-07-17 Michael Kifernew version
1997-05-31 Michael Kifernew 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 ***
next