OSDN Git Service

Merge remote-tracking branch 'origin/master' into convertToSwift
authormasakih <masakih@users.sourceforge.jp>
Thu, 29 Dec 2016 22:46:46 +0000 (07:46 +0900)
committermasakih <masakih@users.sourceforge.jp>
Thu, 29 Dec 2016 22:46:46 +0000 (07:46 +0900)
commit4eaa7a143e09c3360aa93214fb9253e26ca28f5a
tree9a3b9282364749243952ade9abbd7818df12ee4c
parent4ad69452f19ab844168b1d1c5c7c5c15820598ce
parent31198d3c8a2cb4a2c7ef6fc74e8ec344b2929685
Merge remote-tracking branch 'origin/master' into convertToSwift