OSDN Git Service

Merge remote-tracking branch 'origin/develop' master version0.5.3
authoryuki <kimaira7@gmail.com>
Wed, 26 Nov 2014 01:37:30 +0000 (10:37 +0900)
committeryuki <kimaira7@gmail.com>
Wed, 26 Nov 2014 01:37:30 +0000 (10:37 +0900)
commit1d9d66070bd3c350c693be3103b124eeb77b1c4a
tree0d2d3f4e104421dfcdf23df4dafc1f122676f24a
parentafc1df9553c43cefb4557495df94c0af345decdc
parent1544fb8eb84a39db4e8b1c2149ff97315ff7eb63
Merge remote-tracking branch 'origin/develop'

Conflicts:
installbuilder/installbuilder_linux.xml
installbuilder/installbuilder_mac.xml