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

author	MORIOKA Tomohiko <tomo.git@chise.org>
	Thu, 11 May 2017 13:04:09 +0000 (22:04 +0900)
committer	MORIOKA Tomohiko <tomo.git@chise.org>
	Thu, 11 May 2017 13:04:09 +0000 (22:04 +0900)
commit	f434347b531048b0199ffe60424d140c63e162b5
tree	3921fd339338c079c5b0afb9c5354b6f42cbf840	tree \| snapshot
parent	73501d8fa9e79458fc114f4bf761a4e75e2496f7	commit \| diff
parent	4e02672524c520eb785c2b1aef327b6a3ea1c483	commit \| diff

Merge branch 'master' into single-inheritance.