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

[Reiner Steib]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Reiner Steib <rsteib>   08/05/10 13:06:39

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.11049.2.725
retrieving revision 1.11049.2.726
diff -u -b -r1.11049.2.725 -r1.11049.2.726
--- ChangeLog   5 May 2008 15:09:21 -0000       1.11049.2.725
+++ ChangeLog   10 May 2008 13:06:33 -0000      1.11049.2.726
@@ -1,3 +1,7 @@
+2008-05-10  Reiner Steib  <address@hidden>
+
+       * smerge-mode.el (smerge-command-prefix): Fix custom type.
+
 2008-05-05  Carsten Dominik  <address@hidden>
 
        * textmodes/org.el (org-read-date-get-relative): Interpret lone