From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Sat, 11 Jul 2020 12:34:52 +0000 (+0900)
Subject: Merge branch 'master' into single-inheritance
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=119b079efb080ecaaf3e2acc4653932b6943d9e4;p=chise%2Fxemacs-chise.git

Merge branch 'master' into single-inheritance

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

119b079efb080ecaaf3e2acc4653932b6943d9e4
diff --cc lisp/utf-2000/chise-subr.el
index 7f6fcbe,87c0577..62557e0
--- a/lisp/utf-2000/chise-subr.el
+++ b/lisp/utf-2000/chise-subr.el
@@@ -1,7 -1,7 +1,8 @@@
  ;;; chise-subr.el --- basic lisp subroutines for XEmacs CHISE
  
  ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
 +;;   2010, 2011, 2012, 2013, 2014, 2015, 2016 MORIOKA Tomohiko.
+ ;;   2010, 2011, 2012, 2013, 2014, 2015, 2020 MORIOKA Tomohiko.
  
  ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
  ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.