OSDN Git Service

Merge branch 'master' into develop
authordhrname <dhrname@users.sourceforge.jp>
Thu, 16 Jul 2015 13:31:36 +0000 (22:31 +0900)
committerdhrname <dhrname@users.sourceforge.jp>
Thu, 16 Jul 2015 13:31:36 +0000 (22:31 +0900)
commitc47eb5d3f5bf89824e7e22024f4dee925e456c7a
tree19cac02248351570da8c0171ce375a0b700a63a9
parentbc39f8bf7df626b4d65722f402b8ab4e928afded
parent2610d589fa399d4e40199ace8156bc2960bf62db
Merge branch 'master' into develop