Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 20 Mar 2018 06:42:58 +0000 (15:42 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Tue, 20 Mar 2018 06:42:58 +0000 (15:42 +0900)
commit4c13d29699fcbe660d085c0f4b0861ff83f0cec7
tree8d16402cefd5b9587d4707d35bef62655380fa71
parentce93d379fe324e14b894151ebd79c075d0d475f5
parent48b079f0c175691cdb753dc8ddd302e9a5d31cc3
Merge branch 'master' into single-inheritance