OSDN Git Service

Merge branch 'develop' master 0.9.1
authorsuikan <suikan@users.sourceforge.jp>
Sun, 18 Oct 2015 01:23:14 +0000 (10:23 +0900)
committersuikan <suikan@users.sourceforge.jp>
Sun, 18 Oct 2015 01:23:14 +0000 (10:23 +0900)
commit336d1941ddd36362d7a86d61df2abc519d569f97
treebefd83e68791b1a3ead78f05db08794c42486d46
parent79287934c90a2f316131ca40fe5ae45daf7d03cc
parent8b1c4e12bda654c079028859456687f33e19d699
Merge branch 'develop'

Conflicts:
hirado/CHANGES