Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 33f530cbadc42dec86fd13b1516b322910357bcb..bd70b1fdebfac7e7f46c5396d7b9e56ac89714a7 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-28  Bastien Guerry  <bzg@gnu.org>
+
+       * xresources.texi (GTK resources): Fix broken link.
+
+2013-02-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.texi (Interlocking): Don't refer to symlinks as the
+       exclusive means of locking files.
+
 2013-02-22  Glenn Morris  <rgm@gnu.org>
 
        * ack.texi (Acknowledgments):