Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 May 2018 05:38:38 +0000 (14:38 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 7 May 2018 05:38:38 +0000 (14:38 +0900)
commit88184c21118c64c6c76112a75b641622fd2c83eb
treeb5817164ee6bcfd84f39440c139628d182ada29e
parent952c4c6b428c3ce1ba40a38970c9c19ecba5bea3
parentc5c2458485923ea8dec0ff3ca9469496bdbb5786
Merge branch 'master' into single-inheritance