Mon, 16 Jan 2006 08:37:27 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
|
Sun, 25 Sep 2005 22:07:01 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85
|
Sun, 11 Sep 2005 22:21:01 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-81
|
Tue, 06 Sep 2005 00:25:20 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-79
|
Fri, 26 Aug 2005 09:51:52 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78
|
Fri, 29 Jul 2005 01:54:54 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
|
Thu, 07 Jul 2005 12:43:14 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
|
Fri, 24 Jun 2005 01:59:52 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
|
Wed, 15 Jun 2005 23:32:15 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63
|
Sat, 09 Apr 2005 02:16:29 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
|
Mon, 28 Jun 2004 07:56:49 +0000 |
Miles Bader |
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
|
Fri, 16 Apr 2004 12:51:06 +0000 |
Kenichi Handa |
Sync to HEAD
|
Mon, 16 Jan 2006 00:03:54 +0000 |
Henrik Enberg |
sync with trunk
|
Mon, 08 Sep 2003 11:56:09 +0000 |
Kenichi Handa |
New directory
|
Wed, 16 Jan 2008 06:22:59 +0000 |
Dan Nicolaescu |
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
|
Tue, 15 Jan 2008 21:40:09 +0000 |
Stefan Monnier |
(smerge-refine): Also work on "same change conflicts".
|
Mon, 14 Jan 2008 07:38:05 +0000 |
Dan Nicolaescu |
* smerge-mode.el (smerge-auto): New function.
|
Tue, 08 Jan 2008 20:46:54 +0000 |
Miles Bader |
Merge from emacs--rel--22
|
Mon, 19 Nov 2007 08:50:04 +0000 |
Dan Nicolaescu |
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
|
Thu, 08 Nov 2007 16:58:07 +0000 |
Stefan Monnier |
(smerge-refine-subst): Pass "-d" to diff.
|
Sat, 20 Oct 2007 06:30:18 +0000 |
Dan Nicolaescu |
* term/x-win.el (x-gtk-stock-map, icon-map-list)
|
Sat, 20 Oct 2007 01:52:22 +0000 |
Stefan Monnier |
(smerge-auto-refine): New var.
|
Fri, 19 Oct 2007 15:59:13 +0000 |
Stefan Monnier |
Add word-granularity refinement.
|
Tue, 09 Oct 2007 03:38:57 +0000 |
Stefan Monnier |
(smerge-refine-chopup-region): Add `preproc' argument.
|
Sun, 22 Apr 2007 12:12:29 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
Mon, 29 Jan 2007 22:21:19 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
Wed, 03 May 2006 11:56:53 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
Sun, 12 Feb 2006 00:15:44 +0000 |
Karoly Lorentey |
Merged from emacs@sv.gnu.org
|
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)
|