Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 29 Oct 2018 11:18:56 +0000 (20:18 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 29 Oct 2018 11:18:56 +0000 (20:18 +0900)
commitcaaa2488929db3a9391121e7e408e040e7e2ae22
treedfcfdf51a4b88577ced6df4d68fde390490d8edd
parent3374ad642aff9b312755f3ca4b084d65ad96e96d
parentafaf3902d7a05f8c6c4e3d9abd3e5dcf2381eb1b
Merge branch 'master' into single-inheritance