aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-05-17 17:39:40 -0700
committerPaul Eggert2011-05-17 17:39:40 -0700
commit7025ee00190a709853bf5b809bf86148efda3bc7 (patch)
treee1b861b3ea59872e652462289bb7f215d5cfbfbe /doc/misc/ChangeLog
parentd2d818bf00fa3a3204abd9b31103cfca21ff8125 (diff)
parent3870d303a44e14c460977c50473e5069742cd0b6 (diff)
downloademacs-7025ee00190a709853bf5b809bf86148efda3bc7.tar.gz
emacs-7025ee00190a709853bf5b809bf86148efda3bc7.zip
Merge from mainline.
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 df3468ea087..8376dbaa7ca 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12011-05-17 Glenn Morris <rgm@gnu.org>
2
3 * gnus.texi (Face): Fix typo.
4
12011-05-14 Glenn Morris <rgm@gnu.org> 52011-05-14 Glenn Morris <rgm@gnu.org>
2 6
3 * dired-x.texi (Omitting Examples): Minor addition. 7 * dired-x.texi (Omitting Examples): Minor addition.