More merge fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5ab5f3f3122f06e92d11cbfef0a214f21af1a39..018e7da2a83902a45a493fc6c9b04dd3c7c00459 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -30,7 +30,7 @@
 
 2010-10-31  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
 
-       * 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  <rgm@gnu.org>

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 3ab14039828552b87406029d1d5d449ab93dfbf6..6daabfecc894255d44685169db6a5a33a2316079 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -6,12 +6,6 @@
        (semantic-symref-rb-toggle-expand-tag): Replace inappropriate uses
        of toggle-read-only.
 
-2010-10-31  Juanma Barranquero  <lekktu@gmail.com>
-
-       * 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  <cyd@stupidchicken.com>
 
        * semantic/bovine/el.el: