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)
commitbe825b005d82b3d837afcf4185b422b1de4561cc
tree6742aee7ac2fef0e47a4614027e68dc6f9ba0658
parent2621ad52a0303736aa25510cc02ba7ff5b338f1b
parent779caaf35d98cd40d0831ce8f1be65e4405b9c70
Merge branch 'preset_proplist' into kitagawa_test