try different xml
Merge branch 'master' of https://github.com/tongshantang/opencvMFC

Conflicts:
	IdsSimpleLiveDlg.cpp
	IdsSimpleLiveDlg.h
	Imgproc.cpp
	Imgproc.h
	resource.h