Mercurial > emacs
comparison lisp/ChangeLog @ 106394:51d4bdf757c8
Correct conflicts in previous patch.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Thu, 03 Dec 2009 15:56:29 +0000 |
| parents | fec9af996891 |
| children | b99306fb62cc |
comparison
equal
deleted
inserted
replaced
| 106393:fec9af996891 | 106394:51d4bdf757c8 |
|---|---|
| 925 2009-11-21 Nathaniel Flath <flat0103@gmail.com> | 925 2009-11-21 Nathaniel Flath <flat0103@gmail.com> |
| 926 | 926 |
| 927 * progmodes/cc-menus.el (cc-imenu-java-generic-expression): | 927 * progmodes/cc-menus.el (cc-imenu-java-generic-expression): |
| 928 Correct the patch from 2009-11-18. (Bug#3910) | 928 Correct the patch from 2009-11-18. (Bug#3910) |
| 929 | 929 |
| 930 <<<<<<< ChangeLog | |
| 931 ======= | |
| 932 2009-11-21 Alan Mackenzie <acm@muc.de> | |
| 933 | |
| 934 * progmodes/cc-menus.el (cc-imenu-java-generic-expression): | |
| 935 Update to deal with modern Java constructs. | |
| 936 | |
| 937 >>>>>>> 1.16811 | |
| 938 2009-11-21 Tassilo Horn <tassilo@member.fsf.org> | 930 2009-11-21 Tassilo Horn <tassilo@member.fsf.org> |
| 939 | 931 |
| 940 * progmodes/subword.el: Rename from lisp/subword.el. | 932 * progmodes/subword.el: Rename from lisp/subword.el. |
| 941 | 933 |
| 942 * subword.el: Rename to progmodes/subword.el. | 934 * subword.el: Rename to progmodes/subword.el. |