Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 11 Jul 2020 12:34:52 +0000 (21:34 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Sat, 11 Jul 2020 12:34:52 +0000 (21:34 +0900)
commit119b079efb080ecaaf3e2acc4653932b6943d9e4
tree275917e99aef6d3280da73482df9d211b800d624
parent8ee77ea5ce332f69c2e57b6427bcf869e46e2b89
parent83e1e419efdb6944e6eb100c93f4cc542ba9e902
Merge branch 'master' into single-inheritance

Conflicts:
lisp/utf-2000/chise-subr.el
lisp/utf-2000/ChangeLog
lisp/utf-2000/chise-subr.el