log lisp/ChangeLog @ 87743:c2a952d12e21

age author description
Mon, 14 Jan 2008 07:38:05 +0000 Dan Nicolaescu * smerge-mode.el (smerge-auto): New function.
Sun, 13 Jan 2008 20:03:35 +0000 Dan Nicolaescu * vc.el (vc-update): Resolve conflicts if necessary instead of
Sun, 13 Jan 2008 18:18:12 +0000 Martin Rudalics *** empty log message ***
Sun, 13 Jan 2008 18:16:39 +0000 Martin Rudalics *** empty log message ***
Sat, 12 Jan 2008 23:21:25 +0000 Glenn Morris *** empty log message ***
Sat, 12 Jan 2008 12:30:05 +0000 Jason Rumney *** empty log message ***
Fri, 11 Jan 2008 17:30:52 +0000 Jason Rumney *** empty log message ***
Fri, 11 Jan 2008 16:01:26 +0000 Jason Rumney *** empty log message ***
Fri, 11 Jan 2008 15:12:17 +0000 Jason Rumney *** empty log message ***
Fri, 11 Jan 2008 09:59:48 +0000 Martin Rudalics *** empty log message ***
Fri, 11 Jan 2008 04:56:27 +0000 Glenn Morris *** empty log message ***
Thu, 10 Jan 2008 18:49:31 +0000 Martin Rudalics *** empty log message ***
Thu, 10 Jan 2008 17:45:15 +0000 Juanma Barranquero Remove python.el entry duplicated when merging from EMACS_22_BASE.
Thu, 10 Jan 2008 15:08:34 +0000 Tassilo Horn *** empty log message ***