projects / chise / xemacs-chise.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ee77ea 83e1e41)
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)
Conflicts:
lisp/utf-2000/chise-subr.el

1  2 
lisp/utf-2000/ChangeLog patch | diff1 | diff2 | blob | history
lisp/utf-2000/chise-subr.el patch | diff1 | diff2 | blob | history

diff --cc lisp/utf-2000/ChangeLog
Simple merge
diff --cc lisp/utf-2000/chise-subr.el
index 7f6fcbe,87c0577..62557e0
--- 1/lisp/utf-2000/chise-subr.el
--- 2/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.