manual upstream merge

1 files changed, 26 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index bdf317fa2de..d96368c4f9a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,29 @@
+2014-06-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * notes/unicode: Some notes about what to do when a new Unicode
+        version is imported.
+
+2014-06-26  Glenn Morris  <rgm@gnu.org>
+
+        * authors.el: Move here from ../lisp/emacs-lisp.
+
+2014-06-25  Glenn Morris  <rgm@gnu.org>
+
+        * grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el):
+        (${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el):
+        Replace with pattern rules.
+        (${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el)
+        (${cedetdir}/srecode/srt-wy.el): Use $<.
+
+        * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc.
+        (.el.elc): Replace with pattern rule.
+        (%.elc): New.
+        (unidata.txt): Use $<.
+        (compile): Remove.
+        (${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make.
+
+        * unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo.
+
 2014-06-21  Glenn Morris  <rgm@gnu.org>
 
         * unidata/BidiMirroring.txt: Update to 7.0.0 (only comment changes).