aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2010-11-27 15:06:23 -0500
committerChong Yidong2010-11-27 15:06:23 -0500
commita5f092fb934d736bccb4490915fef952dee53805 (patch)
tree07972db1a3dc98afda399a3f9f2a753ee4e12ed9 /doc/misc/ChangeLog
parent0b8394572ac8f80ba3f3e7bc7fb6793325e0bdb6 (diff)
parent07976ae3b816dea4fd541bbba862603d3132eb2c (diff)
downloademacs-a5f092fb934d736bccb4490915fef952dee53805.tar.gz
emacs-a5f092fb934d736bccb4490915fef952dee53805.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'doc/misc/ChangeLog')
-rw-r--r--doc/misc/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 38671f1410c..91ac5f74b0e 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
12010-11-27 Glenn Morris <rgm@gnu.org>
2 James Clark <none@example.com>
3
4 * nxml-mode.texi (Introduction): New section.
5
12010-11-21 Lars Magne Ingebrigtsen <larsi@gnus.org> 62010-11-21 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * gnus.texi (Server Commands): Document gnus-server-show-server. 8 * gnus.texi (Server Commands): Document gnus-server-show-server.