Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Oct 2018 10:23:42 +0000 (19:23 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 1 Oct 2018 10:23:42 +0000 (19:23 +0900)
commit5aa00f750ac12ae63a3c20ffc1b968989ac8e2f7
treebdb40b70b6008060db99c149b25c15eb473efebe
parent86eb0c9a9876a9bc7157d67a5f9166991a3f7ea2
parent381b5dc134c8b210f6897637a73286e12ec7ab4c
Merge branch 'master' into single-inheritance