More merge fixes.

f486841f · Juanma Barranquero · c8c59954 · f486841f · f486841f
Commit f486841f authored Oct 31, 2010 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

lisp/ChangeLog lisp/ChangeLog +1 -1

lisp/cedet/ChangeLog lisp/cedet/ChangeLog +0 -6

No files found.
--- 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>

--- 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: