[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog |
Date: |
Thu, 03 Dec 2009 15:56:32 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Alan Mackenzie <acmacm> 09/12/03 15:56:32
Modified files:
lisp : ChangeLog
Log message:
Correct conflicts in previous patch.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16813&r2=1.16814
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16813
retrieving revision 1.16814
diff -u -b -r1.16813 -r1.16814
--- ChangeLog 3 Dec 2009 15:52:37 -0000 1.16813
+++ ChangeLog 3 Dec 2009 15:56:29 -0000 1.16814
@@ -927,14 +927,6 @@
* progmodes/cc-menus.el (cc-imenu-java-generic-expression):
Correct the patch from 2009-11-18. (Bug#3910)
-<<<<<<< ChangeLog
-=======
-2009-11-21 Alan Mackenzie <address@hidden>
-
- * progmodes/cc-menus.el (cc-imenu-java-generic-expression):
- Update to deal with modern Java constructs.
-
->>>>>>> 1.16811
2009-11-21 Tassilo Horn <address@hidden>
* progmodes/subword.el: Rename from lisp/subword.el.
- [Emacs-diffs] emacs/lisp ChangeLog, Kenichi Handa, 2009/12/02
- [Emacs-diffs] emacs/lisp ChangeLog, Roland Winkler, 2009/12/03
- [Emacs-diffs] emacs/lisp ChangeLog, Alan Mackenzie, 2009/12/03
- [Emacs-diffs] emacs/lisp ChangeLog,
Alan Mackenzie <=
- [Emacs-diffs] emacs/lisp ChangeLog, Glenn Morris, 2009/12/04
- [Emacs-diffs] emacs/lisp ChangeLog, Roland Winkler, 2009/12/04
- [Emacs-diffs] emacs/lisp ChangeLog, Alan Mackenzie, 2009/12/05
- [Emacs-diffs] emacs/lisp ChangeLog, Glenn Morris, 2009/12/05
- [Emacs-diffs] emacs/lisp ChangeLog, Kevin Ryde, 2009/12/05
- [Emacs-diffs] emacs/lisp ChangeLog, Kevin Ryde, 2009/12/05
- [Emacs-diffs] emacs/lisp ChangeLog, Roland Winkler, 2009/12/06
- [Emacs-diffs] emacs/lisp ChangeLog, Eli Zaretskii, 2009/12/07
- [Emacs-diffs] emacs/lisp ChangeLog, Glenn Morris, 2009/12/07
- [Emacs-diffs] emacs/lisp ChangeLog, Kenichi Handa, 2009/12/08