Merge branch 'master' into single-inheritance
authorMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 10 May 2018 12:00:35 +0000 (21:00 +0900)
committerMORIOKA Tomohiko <tomo.git@chise.org>
Thu, 10 May 2018 12:00:35 +0000 (21:00 +0900)
commit82cbd3a15fc527df0fc4a005b9e20ed8a7e0da71
treecbfa51e82758b62ec8f87888285b0a8bd4f68f4d
parentd5c5c220fe41b85241f9bb6c222a2b783cb9745c
parent0f32e94e63549a803257dd1612fcdb83dbd6a149
Merge branch 'master' into single-inheritance