diff options
| author | Sam Steingold | 2009-07-07 15:06:00 +0000 |
|---|---|---|
| committer | Sam Steingold | 2009-07-07 15:06:00 +0000 |
| commit | 9ba562d3da40918a8727ebc3ba4f4d2b2a2dfeba (patch) | |
| tree | 0e7f64374cb0091ba36b427bb67bfd429da701ad /lisp/ChangeLog | |
| parent | fcaf6f3a784c8da98f1fb377ab2630a956a0c4e7 (diff) | |
| download | emacs-9ba562d3da40918a8727ebc3ba4f4d2b2a2dfeba.tar.gz emacs-9ba562d3da40918a8727ebc3ba4f4d2b2a2dfeba.zip | |
(vc-cvs-merge-news): Fix message parsing for non-top-level files.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7196d29c477..6e9bbb1ef46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-07-07 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * vc-cvs.el (vc-cvs-merge-news): Fix message parsing for | ||
| 4 | non-top-level files. | ||
| 5 | |||
| 1 | 2009-07-07 Kenichi Handa <handa@m17n.org> | 6 | 2009-07-07 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * international/mule-cmds.el (reset-language-environment): Put | 8 | * international/mule-cmds.el (reset-language-environment): Put |