OSDN Git Service

Merge branch 'cjascale' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 14 Jan 2018 07:50:42 +0000 (16:50 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 14 Jan 2018 07:50:42 +0000 (16:50 +0900)

Trivial merge