test

Signed-off-by: xfm84 <xfm84@163.com>
Merge branch 'master' of https://github.com/xfm84/test

Conflicts:
	Clip/Clip.cpp