diff options
| author | Glenn Morris | 2010-12-13 09:26:01 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-12-13 09:26:01 -0800 |
| commit | a653f276763533708df0da340f27bdcad65cecb7 (patch) | |
| tree | 7f629a5e3f40447cdb6637ae73c13d0f27212657 | |
| parent | e1115396be405d58d8ca29c349ff9ade5ba4cd69 (diff) | |
| download | emacs-a653f276763533708df0da340f27bdcad65cecb7.tar.gz emacs-a653f276763533708df0da340f27bdcad65cecb7.zip | |
ChangeLog merge fix.
| -rw-r--r-- | doc/misc/ChangeLog | 1 | ||||
| -rw-r--r-- | etc/ChangeLog | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index d7d5618ae8d..9d3b578fc95 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | * cl.texi (For Clauses): Small fixes for frames and windows. | 3 | * cl.texi (For Clauses): Small fixes for frames and windows. |
| 4 | 4 | ||
| 5 | 2010-12-13 Glenn Morris <rgm@gnu.org> | ||
| 6 | 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> | 5 | 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> |
| 7 | 6 | ||
| 8 | * org.texi (Using capture): Document using prefix arguments for | 7 | * org.texi (Using capture): Document using prefix arguments for |
diff --git a/etc/ChangeLog b/etc/ChangeLog index 6fd4b35b810..d21e005f180 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | * schema/schemas.xml: Add DocBook (Bug#7491). | 3 | * schema/schemas.xml: Add DocBook (Bug#7491). |
| 4 | 4 | ||
| 5 | 2010-12-13 Ulrich Mueller <ulm@gentoo.org> | ||
| 6 | 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> | 5 | 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> |
| 7 | 6 | ||
| 8 | * refcards/orgcard.tex: Cleanup. | 7 | * refcards/orgcard.tex: Cleanup. |