OSDN Git Service

Merge branch 'master' into develop
authordhrname <dhrname@users.sourceforge.jp>
Wed, 12 Dec 2012 12:38:08 +0000 (21:38 +0900)
committerdhrname <dhrname@users.sourceforge.jp>
Wed, 12 Dec 2012 12:38:08 +0000 (21:38 +0900)
commit1fae6c19ef8a52e1a34a19475f29f3dfe91a194d
tree16b931aa3059b33c622536798ffaa7cf9ee61935
parenta542a67997297869d44c6523a8bd3c6620b9fc21
parent3ad89f759c99f2dca6b83294aa1bcaf1d1c1948f
Merge branch 'master' into develop