aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-07-12 10:38:05 -0700
committerPaul Eggert2011-07-12 10:38:05 -0700
commit2b64ccd2b5916083a421b0263a5bc1d3d075d82b (patch)
treecd80e7dbca2a0bf71687688188d701fa61d52608 /doc/misc/ChangeLog
parent82d66f4e89f12f5c5eb6e4a4f80745a69da6b710 (diff)
parent077e3dda9478f958acb9c9d5b98e0f739726dea7 (diff)
downloademacs-2b64ccd2b5916083a421b0263a5bc1d3d075d82b.tar.gz
emacs-2b64ccd2b5916083a421b0263a5bc1d3d075d82b.zip
Merge from trunk.
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a977b9d2f7f..3738301ceea 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * org.texi (Special agenda views): Fix double quoting (bug#3509).
4
12011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * ediff.texi (Major Entry Points): Remove mention of `require', 7 * ediff.texi (Major Entry Points): Remove mention of `require',