Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 11 Aug 2017 06:28:01 +0000 (15:28 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 11 Aug 2017 06:28:01 +0000 (15:28 +0900)
commita68f3d08b779f084d2367ada03f7be17d0501e74
tree77036f0aab4e780add2366dcafd7025f29ddfb87
parentf412cb06f5d308e12023b837f4013cbb781279fc
parent154d36a5920299e8ad9476f69f878a03f004d347
Merge branch 'master' into single-inheritance