diff options
| author | Glenn Morris | 2011-01-14 09:42:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-14 09:42:40 -0800 |
| commit | 15a1cca8ecc4b5a7330f377e608a34552fc9fc0a (patch) | |
| tree | 5a221e5aae726c74e1b9d019571c8c6c91914f65 /doc | |
| parent | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (diff) | |
| download | emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.tar.gz emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.zip | |
ChangeLog merge fixes.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 92b61e75688..24efb00e552 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | * nxml-mode.texi (Introduction): Fix file name typos. | 3 | * nxml-mode.texi (Introduction): Fix file name typos. |
| 4 | 4 | ||
| 5 | 2011-01-14 Glenn Morris <rgm@gnu.org> | ||
| 6 | 2011-01-13 Christian Ohler <ohler@gnu.org> | 5 | 2011-01-13 Christian Ohler <ohler@gnu.org> |
| 7 | 6 | ||
| 8 | * ert.texi: New file. | 7 | * ert.texi: New file. |