Merge commit '031b0b40a6db3d459c68ff097985db737abad8c1'

author MORIOKA Tomohiko <tomo.git@chise.org>

Mon, 15 Nov 2021 13:16:23 +0000 (22:16 +0900)

committer MORIOKA Tomohiko <tomo.git@chise.org>

Mon, 15 Nov 2021 13:16:23 +0000 (22:16 +0900)
author MORIOKA Tomohiko <tomo.git@chise.org>
Mon, 15 Nov 2021 13:16:23 +0000 (22:16 +0900)
committer MORIOKA Tomohiko <tomo.git@chise.org>
Mon, 15 Nov 2021 13:16:23 +0000 (22:16 +0900)
diff --cc IDS-UCS-Basic.txt
Simple merge
diff --cc IDS-UCS-Ext-A.txt
Simple merge
author	MORIOKA Tomohiko <tomo.git@chise.org>
	Mon, 15 Nov 2021 13:16:23 +0000 (22:16 +0900)
committer	MORIOKA Tomohiko <tomo.git@chise.org>
	Mon, 15 Nov 2021 13:16:23 +0000 (22:16 +0900)
		1	2
IDS-UCS-Basic.txt	patch \|	diff1 \|	diff2 \|	blob \| history
IDS-UCS-Ext-A.txt	patch \|	diff1 \|	diff2 \|	blob \| history