Sync up with r21-4-22-chise-0_25-5.

diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog
index 80c86f8..a27a943 100644 (file)
--- a/lisp/utf-2000/ChangeLog
+++ b/lisp/utf-2000/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * Ideograph-R157-Foot.el (C3-5B3D): Separate JC3-66C6.
+
 2010-12-29  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * Ideograph-R158-Body.el: Add mappings between CJK Ext B and CNS

diff --git a/src/ChangeLog b/src/ChangeLog
index 8184b02..f681de1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-04  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * concord.c (Fconcord_genre_ds): Add "#ifdef HAVE_LIBCHISE" ...
+       "#endif" for code to refer Vchise_system_db_directory.
+
 2010-12-07  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * concord.c (Fconcord_object_put): Use `member' instead of `memq'.