diff options
| author | Chong Yidong | 2011-02-12 19:16:28 -0500 |
|---|---|---|
| committer | Chong Yidong | 2011-02-12 19:16:28 -0500 |
| commit | e730aabed55f3b65020672f1d58afc55fda4eef2 (patch) | |
| tree | db931d6586b8ce49b8428fcc45c83825b2c60252 /etc | |
| parent | d0ba09dcd877f4e8b6b7643c69d596ac88b545bc (diff) | |
| parent | 84eb0351d8be4811897c8cf62a69757ff5d14001 (diff) | |
| download | emacs-e730aabed55f3b65020672f1d58afc55fda4eef2.tar.gz emacs-e730aabed55f3b65020672f1d58afc55fda4eef2.zip | |
Merge changes from emacs-23 branch
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 142ece63f36..4b02d9b1d08 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -386,7 +386,7 @@ | |||
| 386 | * srecode/doc-default.srt (section-comment, function-comment) | 386 | * srecode/doc-default.srt (section-comment, function-comment) |
| 387 | (variable-same-line-comment, group-comment-start, group-comment-end): | 387 | (variable-same-line-comment, group-comment-start, group-comment-end): |
| 388 | * srecode/doc-java.srt (function-comment, variable-same-line-comment) | 388 | * srecode/doc-java.srt (function-comment, variable-same-line-comment) |
| 389 | (group-comment-start, gropu-comment-end): | 389 | (group-comment-start, group-comment-end): |
| 390 | Fix typos in template docstrings. | 390 | Fix typos in template docstrings. |
| 391 | 391 | ||
| 392 | 2010-01-14 Kenichi Handa <handa@m17n.org> | 392 | 2010-01-14 Kenichi Handa <handa@m17n.org> |