HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8578c22
)
Correct conflicts in previous patch.
author
Alan Mackenzie
<acm@muc.de>
Thu, 3 Dec 2009 15:56:29 +0000
(15:56 +0000)
committer
Alan Mackenzie
<acm@muc.de>
Thu, 3 Dec 2009 15:56:29 +0000
(15:56 +0000)
lisp/ChangeLog
patch
|
blob
|
blame
|
history
diff --git
a/lisp/ChangeLog
b/lisp/ChangeLog
index
d1c01eb
..
d8e08eb
100644
(file)
--- a/
lisp/ChangeLog
+++ b/
lisp/ChangeLog
@@
-927,14
+927,6
@@
Enhance `c-parse-state' to run efficiently in "brace desserts".
* progmodes/cc-menus.el (cc-imenu-java-generic-expression):
Correct the patch from 2009-11-18. (Bug#3910)
-<<<<<<< ChangeLog
-=======
-2009-11-21 Alan Mackenzie <acm@muc.de>
-
- * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
- Update to deal with modern Java constructs.
-
->>>>>>> 1.16811
2009-11-21 Tassilo Horn <tassilo@member.fsf.org>
* progmodes/subword.el: Rename from lisp/subword.el.