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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        06/08/03 18:30:13

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.9899
retrieving revision 1.9900
diff -u -b -r1.9899 -r1.9900
--- ChangeLog   3 Aug 2006 14:26:27 -0000       1.9899
+++ ChangeLog   3 Aug 2006 18:30:13 -0000       1.9900
@@ -1,3 +1,8 @@
+2006-08-03  Stefan Monnier  <address@hidden>
+
+       * progmodes/gud.el (gdb-script-font-lock-syntactic-keywords):
+       Correctly mark the end-of-docstring char.
+
 2006-08-03  Chong Yidong  <address@hidden>
 
        * simple.el (line-move-to-column): Constrain move-to-column to
@@ -180,8 +185,13 @@
 
        * tumme.el (tumme-backward-image): Add prefix argument.  Add error
        when at first image.
+<<<<<<< ChangeLog
+       (tumme-forward-image): Add prefix argument.
+       Add error when at last image.
+=======
        (tumme-forward-image): Add prefix argument.  Add error when at last
        image.
+>>>>>>> 1.9899
 
 2006-07-25  Stefan Monnier  <address@hidden>