OSDN Git Service

Merge branch 'master' into kitagawa_test
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 21 Feb 2017 22:36:40 +0000 (07:36 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 21 Feb 2017 22:36:40 +0000 (07:36 +0900)
commit56c79c0cb7a16d2c0d4108257992acdc738ecd2e
tree137aa482dd5d8174971835c37c85c3cb445c908d
parentf46d608763a02bea9eb0761a23f19ca70cb8adf6
parentd9d2facb797b50da415e204792af1a3cfc18a488
Merge branch 'master' into kitagawa_test