[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Reiner Steib]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Reiner Steib <rsteib>   08/05/10 13:09:07

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13707
retrieving revision 1.13708
diff -u -b -r1.13707 -r1.13708
--- ChangeLog   10 May 2008 12:40:55 -0000      1.13707
+++ ChangeLog   10 May 2008 13:09:04 -0000      1.13708
@@ -1,3 +1,7 @@
+2008-05-10  Reiner Steib  <address@hidden>
+
+       * smerge-mode.el (smerge-command-prefix): Fix custom type.
+
 2008-05-10  Eric S. Raymond  <address@hidden>
 
        * vc-dispatcher.el (vc-dir-next-directory, vc-dir-prev-directory):