summaryrefslogtreecommitdiff
path: root/lisp/cedet
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-10-31 19:38:16 +0100
committerJuanma Barranquero <lekktu@gmail.com>2010-10-31 19:38:16 +0100
commitf486841f693606fff8f40a47f9d1a5afcf0a343d (patch)
tree94c1441d0778e0efb1865856115455bcfd360116 /lisp/cedet
parentc8c599548191c0d9f903e20d010b076dcd74170a (diff)
downloademacs-f486841f693606fff8f40a47f9d1a5afcf0a343d.tar.gz
More merge fixes.
Diffstat (limited to 'lisp/cedet')
-rw-r--r--lisp/cedet/ChangeLog6
1 files changed, 0 insertions, 6 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 3ab14039828..6daabfecc89 100644
--- 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: