Merge from emacs-24; up to 117698

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 17de5a4990230412ff53c56ef49d5a876b18e444..1c439504892f620cc4f31467ab3c29c0ee25f8a8 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-10  Eli Zaretskii  <eliz@gnu.org>
+
+       * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
+       unmsys--file-name.  (Bug#18955)
+
 2014-11-10  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (set-version): No need to update doc/man/emacs.1.