Merge from trunk and resolve conflicts.

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3955bd09b38c60f09b69db1470ff5e367bfb0479..b8f17c0fae579488f468e2e375028dc16f008343 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -121,6 +121,11 @@
 
        * eval.texi (Eval): Mention possible recovery from stack overflow.
 
+2014-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * display.texi (Bidirectional Display): Update the version of the
+       UBA to which we are conforming.
+
 2014-07-11  Eli Zaretskii  <eliz@gnu.org>
 
        * internals.texi (Garbage Collection): Fix last change.