合并
Merge branch 'master' of https://github.com/Ji-Yuhang/nce

Conflicts:
	src/mainwindow.hxx