[Emacs-diffs] /srv/bzr/emacs/trunk r104120: ChangeLog merge fix, grumble.

[Glenn Morris]

------------------------------------------------------------
revno: 104120
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-05-04 23:25:24 -0700
message:
  ChangeLog merge fix, grumble.
modified:
  lisp/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-05 04:00:38 +0000
+++ b/lisp/ChangeLog    2011-05-05 06:25:24 +0000
@@ -1,8 +1,3 @@
-2011-05-05  Daniel Colascione <address@hidden>
-
-       * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Use
-       correct match group (bug#8438).
-
 2011-05-05  Stefan Monnier  <address@hidden>
 
        Fix earlier half-done eieio-defmethod change (bug#8338).