OSDN Git Service

Merge branch 'preset_proplist' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 30 Jul 2017 01:13:21 +0000 (10:13 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Sun, 30 Jul 2017 01:13:21 +0000 (10:13 +0900)

Trivial merge