OSDN Git Service

Merge branch 'master' into kitagawa_adjust
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 31 Aug 2016 03:14:07 +0000 (12:14 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Wed, 31 Aug 2016 03:14:07 +0000 (12:14 +0900)
commitb901211cd8eddc8dbd517a64748bcc6ada087690
tree9f4468cd384d8de9ca87df6707339d68c16bc2d5
parenta23769444d2379bd9e2852a6faf9738f8b9c68b6
parentebd2045f18df7a4ffc0decf0076f0c9b9d735193
Merge branch 'master' into kitagawa_adjust