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

author	MORIOKA Tomohiko <tomo.git@chise.org>
	Tue, 6 Jun 2017 18:09:47 +0000 (03:09 +0900)
committer	MORIOKA Tomohiko <tomo.git@chise.org>
	Tue, 6 Jun 2017 18:09:47 +0000 (03:09 +0900)
commit	c5a05c445c903b37711a816f4958f188e1850145
tree	f8ca15f7478cbd605655c55a332a6f0536dcc8e7	tree \| snapshot
parent	5acef92b77147edfd2eb3094072cc70fed898ac1	commit \| diff
parent	9eaf382e9fc2658a5774f1cda0c14f3667df0747	commit \| diff

Merge branch 'master' into single-inheritance.