Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 5 Feb 2018 16:39:02 +0000 (01:39 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Mon, 5 Feb 2018 16:39:02 +0000 (01:39 +0900)
commita0c2ab9e63a9b2b20ad2a765d497b1068412fbdc
tree7439b2982f24947d0b5dcbd54111061f209f6f78
parent61085e6d97cefbcbe1a80e00c5468af3481f087a
parent6eba44d4d9367428865427a571dda8a9706961ef
Merge branch 'master' into single-inheritance