Tue, 01 Nov 2005 06:23:08 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)
|
Sun, 09 Oct 2005 20:00:17 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)
|
Fri, 09 Sep 2005 20:52:13 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
Sun, 04 Sep 2005 03:48:17 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
|
Tue, 05 Jul 2005 22:22:24 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 469)
|
Tue, 05 Jul 2005 22:12:55 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449-468)
|
Tue, 21 Jun 2005 15:42:45 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 423-434)
|
Wed, 15 Jun 2005 12:57:51 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350-422)
|
Mon, 11 Apr 2005 12:40:15 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
|
Mon, 04 Apr 2005 16:43:15 +0000 |
Karoly Lorentey |
Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231)
|
Sat, 01 May 2004 19:23:22 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
Fri, 16 Apr 2004 13:36:07 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
Thu, 15 Apr 2004 16:49:22 +0000 |
Karoly Lorentey |
Merged in changes from CVS trunk.
|
Thu, 25 Mar 2004 22:21:45 +0000 |
Karoly Lorentey |
Merged in changes from CVS HEAD
|
Fri, 19 Mar 2004 22:32:48 +0000 |
Karoly Lorentey |
Merged in changes from CVS HEAD
|
Tue, 16 Mar 2004 20:27:22 +0000 |
Karoly Lorentey |
Merged in changes from CVS HEAD
|
Sat, 10 May 2008 13:06:33 +0000 |
Reiner Steib |
(smerge-command-prefix): Fix custom type.
|
Mon, 07 Jan 2008 02:45:14 +0000 |
Glenn Morris |
Add 2008 to copyright years.
|
Thu, 16 Aug 2007 20:04:36 +0000 |
Stefan Monnier |
(smerge-resolve): New arg `safe'.
|
Wed, 25 Jul 2007 04:47:42 +0000 |
Glenn Morris |
Switch license to GPLv3 or later.
|
Thu, 08 Mar 2007 20:12:55 +0000 |
Stefan Monnier |
(smerge-remove-props): Don't mark the buffer modified.
|
Sun, 21 Jan 2007 03:53:13 +0000 |
Glenn Morris |
Add 2007 to copyright years.
|
Sun, 30 Apr 2006 15:49:08 +0000 |
Stefan Monnier |
Update my email address.
|
Mon, 06 Feb 2006 15:23:23 +0000 |
Thien-Thi Nguyen |
Update years in copyright notice; nfc.
|
Wed, 26 Oct 2005 08:38:07 +0000 |
Romain Francoise |
Add 'tools' to file keywords.
|
Fri, 23 Sep 2005 18:15:20 +0000 |
Stefan Monnier |
(smerge-remove-props): Cause re-highlighting of the whole conflict.
|
Fri, 09 Sep 2005 01:16:05 +0000 |
Richard M. Stallman |
(smerge-resolve): Pass args to smerge-remove-props.
|
Fri, 26 Aug 2005 09:37:04 +0000 |
Juanma Barranquero |
(smerge-refined-change): Add :group.
|
Thu, 25 Aug 2005 20:13:38 +0000 |
Stefan Monnier |
(smerge-remove-props): Make the args non-optional.
|
Mon, 22 Aug 2005 14:38:51 +0000 |
Stefan Monnier |
(smerge-basic-map): Bind smerge-combine-with-next.
|