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 83d5b1d25ed5ff856f019a8dce36258dafbfddc6..bd70b1fdebfac7e7f46c5396d7b9e56ac89714a7 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,17 @@
+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):
+       * emacs.texi (Acknowledgments): Small updates.
+
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 
        * files.texi (File Conveniences): Not just GIFs can be animated.