From: suikan <suikan@users.sourceforge.jp>
Date: Sun, 18 Oct 2015 01:23:14 +0000 (+0900)
Subject: Merge branch 'develop'
X-Git-Tag: 0.9.1^0
X-Git-Url: http://git.osdn.net/view?p=trx-305dsp%2Fdsp.git;a=commitdiff_plain;h=336d1941ddd36362d7a86d61df2abc519d569f97

Merge branch 'develop'

Conflicts:
	hirado/CHANGES
---

336d1941ddd36362d7a86d61df2abc519d569f97