projects / chise / xemacs-chise.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 083e45f 0f211aa)
Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 21 Sep 2022 00:44:08 +0000 (09:44 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Wed, 21 Sep 2022 00:44:08 +0000 (09:44 +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 8f948a7,8f8eab5..dc26fc0
--- 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,11 @@@
  ;;; chise-subr.el --- basic lisp subroutines for XEmacs CHISE
  
  ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
++<<<<<<< HEAD
 +;;   2010, 2011, 2012, 2013, 2014, 2015, 2016, 2020, 2021 MORIOKA Tomohiko.
++=======
+ ;;   2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021, 2022 MORIOKA Tomohiko.
++>>>>>>> master
  
  ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
  ;; Keywords: CHISE, Character Database, ISO/IEC 10646, UCS, Unicode, MULE.