Commit f486841f authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

More merge fixes.

parent c8c59954
......@@ -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>
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment