diff options
| author | Mark A. Hershberger | 2010-01-24 23:52:26 -0500 |
|---|---|---|
| committer | Mark A. Hershberger | 2010-01-24 23:52:26 -0500 |
| commit | b1bb0a2570b8a40017220097c40c6057cfe17efe (patch) | |
| tree | d308182f02f1d459ea9a21c31a8ca8b0f3b4f787 /doc/misc/ChangeLog | |
| parent | aaef4f91fad60716fa070b912d71b9f1ccd2e7b4 (diff) | |
| parent | 8dc1adf681df162bfd305debef0e1ab31bed3ebd (diff) | |
| download | emacs-b1bb0a2570b8a40017220097c40c6057cfe17efe.tar.gz emacs-b1bb0a2570b8a40017220097c40c6057cfe17efe.zip | |
merge conflict
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 50673dc7147..fe34433c391 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,4 +1,8 @@ | |||
| 1 | 2010-01-19 Mark A. Hershberger <mah@everybody.org> | 1 | 2010-01-24 Mark A. Hershberger <mah@everybody.org> |
| 2 | |||
| 3 | * gnus.texi (Score File Format): Fix typo. | ||
| 4 | |||
| 5 | 2010-01-21 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 2 | 6 | ||
| 3 | * cc-mode.texi: Replace references to obsolete c-subword-mode. | 7 | * cc-mode.texi: Replace references to obsolete c-subword-mode. |
| 4 | 8 | ||