Merge from trunk.

1 files changed, 35 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 07aa0d4dd9d..40300fc8dcf 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+2011-09-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib (Bug#9169).
         * notes/copyright: The files compile, config.guess, config.sub,
@@ -7,6 +7,40 @@
         and warn-on-use.h are now in build-aux/snippets.  New file
         build-aux/snippets/_Noreturn.h.
 
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/unidata-gen.el (unidata-prop-alist): Update the default
+        values of bidi-class according to DerivedBidiClass.txt from the
+        latest UCD.
+
+2011-08-23  Kenichi Handa  <handa@m17n.org>
+
+        * unidata/unidata-gen.el (unidata-prop-alist): Provide default
+        values for name, general-category, canonical-combining-class,
+        mirrored, and bidi-class.  Describe the meaning of value nil for
+        decimal-digit-value, digit-value, numeric-value, uppercase,
+        lowercase, titlecase, and mirroring.
+        (unidata-gen-table): Handle the case that default-value is a
+        list.  Set default values of characters not listed in a table.
+        (unidata-get-name): Return an empty string if a value in a
+        char-table is nil.
+        (unidata-get-decomposition): Return a list of character itself if
+        a value in a char-table is nil.
+
+2011-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * unidata/bidimirror.awk: File removed.
+
+        * unidata/biditype.awk: File removed.
+
+        * unidata/makefile.w32-in (all): Remove src/biditype.h and
+        src/bidimirror.h.
+        (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+
+        * unidata/Makefile.in (all): Remove src/biditype.h and
+        src/bidimirror.h.
+        (../../src/biditype.h, ../../src/bidimirror.h): Deleted.
+
 2011-07-07  Juanma Barranquero  <lekktu@gmail.com>
 
         * unidata/makefile.w32-in (charprop-SH, charprop-CMD):