Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Nov 2017 16:30:07 +0000 (01:30 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Fri, 17 Nov 2017 16:30:07 +0000 (01:30 +0900)
commit9330844e185de864440be2f85f8e4138725df9b9
tree5672d5a978a92c86fdd1b2d33bdef2dd4133d360
parentd98b015567f1af4cae0b144abb57a6d5bd533045
parent3d4d2e7d8f297774b18b69edf7436f0abc373001
Merge branch 'master' into single-inheritance