OSDN Git Service

Merge branch 'develop'
authoryuki <kimaira7@gmail.com>
Tue, 25 Nov 2014 09:18:34 +0000 (18:18 +0900)
committeryuki <kimaira7@gmail.com>
Tue, 25 Nov 2014 09:18:34 +0000 (18:18 +0900)
commit2b1f740dee0355893dad68dcb272ecc8fc81ffa5
tree95cc06a7a5bebd2eecb436638630b3c564637f6c
parentef97889ca1436d436acf867b4edb6c0d681dee4d
parent344849c0d0a5d3050b4c25073c53ebb9da14a986
Merge branch 'develop'