resove

Signed-off-by: daowzq <wu922008@126.com>
Merge branch 'master' of github.com:daowzq/ExtFrame

Conflicts:
	HDFrame.v11.suo