@design component
@relayout project
Merge branch 'master' of github.com:NosicLin/FSpriteDesigner

Conflicts:
	src/DsMainFrame.cc
	src/DsMainFrame.h
	src/main.cc

@ merge confilt
@relayout project