test
Merge branch 'master' of github:kyushu-pc/kpc

Conflicts:
	dxprogram/dxprogram.cpp