git.chise.org Git - chise/xemacs-chise.git-/commit

author	MORIOKA Tomohiko <tomo.git@chise.org>
	Sun, 14 May 2017 06:33:39 +0000 (15:33 +0900)
committer	MORIOKA Tomohiko <tomo.git@chise.org>
	Sun, 14 May 2017 06:33:39 +0000 (15:33 +0900)
commit	e8eefe5b35a63236ef79a724347062fb6a31bb9e
tree	f2469ceaedf711c3a1f6ddaa773caaec94873f6b	tree \| snapshot
parent	c6e468ddd2d34394f0d8b68c85f0bd26d7a973cb	commit \| diff
parent	8a17fbdbc107d820430d4891f0fb88f702ef8039	commit \| diff

Merge branch 'master' into single-inheritance.