projects / chise / xemacs-chise.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2f05b7 387979b)
Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 3 Mar 2021 23:20:54 +0000 (08:20 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 3 Mar 2021 23:20:54 +0000 (08:20 +0900)
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 f59fe1c,f0e65de..8f948a7
--- 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,7 @@@
  ;;; 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, 2020 MORIOKA Tomohiko.
 -;;   2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021 MORIOKA Tomohiko.
++;;   2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020, 2021 MORIOKA Tomohiko.
  
  ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
  ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.