Merge from emacs-23

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5c0ff3da2067811862e2579b65da8457361ca944..fe9cd8a73b4b483427735cec763b86eb30a82835 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * msdog.texi (Windows HOME): Add information regarding startup
+       directory when invoking Emacs from a desktop shortcut.  (bug#7300)
+
 2010-10-11  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (MAKEINFO): Add explicit -I$srcdir.