OSDN Git Service

Merge branch 'develop'
authordhrname <dhrname@users.sourceforge.jp>
Wed, 7 Mar 2012 13:43:06 +0000 (22:43 +0900)
committerdhrname <dhrname@users.sourceforge.jp>
Wed, 7 Mar 2012 13:43:06 +0000 (22:43 +0900)
commit7a60431901296e85bc4a1dae338401e7b5e14ed3
treea2d74eced9504f83b9ba01829c80644b145ca892
parentb2eb77f6ee73ee86c4419a9b9840239b06f6b6e8
parentb139920baba27b53ace1c971506d8b22bbc2b709
Merge branch 'develop'

Conflicts:
ChangeLog.txt