Merge from trunk and resolve conflicts.

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 711208e0e32bfaf073ab108bf7e05a6c56075d65..c74f86b1fb56bc1341b16f55ca815179c11552db 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -82,6 +82,10 @@
        * NEWS: Mention that string-collate-* functions are supported on
        MS-Windows as well.
 
+2014-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * NEWS: Mention the UBA implementation update.
+
 2014-08-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * compilation.txt (file): Add Guile backtrace example.