[Emacs-diffs] /srv/bzr/emacs/trunk r102170: More merge fixes.

[Juanma Barranquero]

------------------------------------------------------------
revno: 102170
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 19:38:16 +0100
message:
  More merge fixes.
modified:
  lisp/ChangeLog
  lisp/cedet/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-31 18:26:54 +0000
+++ b/lisp/ChangeLog    2010-10-31 18:38:16 +0000
@@ -30,7 +30,7 @@
 
 2010-10-31  Aaron S. Hawley  <address@hidden>
 
-       * add-log.el (find-change-log): Use derived-mode-p rather than
+       * vc/add-log.el (find-change-log): Use derived-mode-p rather than
        major-mode (bug#7284).
 
 2010-10-31  Glenn Morris  <address@hidden>

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2010-10-31 14:40:01 +0000
+++ b/lisp/cedet/ChangeLog      2010-10-31 18:38:16 +0000
@@ -6,12 +6,6 @@
        (semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses
        of toggle-read-only.
 
-2010-10-31  Juanma Barranquero  <address@hidden>
-
-       * semantic/symref/list.el (semantic-symref-list-rename-open-hits):
-       Fix typo in message.
-       (semantic-symref-list-map-open-hits): Fix typo in docstring.
-
 2010-09-30  Chong Yidong  <address@hidden>
 
        * semantic/bovine/el.el: