Delphi-OpenCV/samples/MultiDemo/CameraShift
Laentir Valetov 68f0590ee0 Merge branch 'master' of github.com:Laex/Delphi-OpenCV
Conflicts:
	.gitignore
	Bin/Win64/cCameraCapture.rsm
	samples/Components/cMatchTemplate/cMatchTemplate.dproj
	samples/MultiDemo/FaceDetectAndLockWorkstation/LockWorkstation.dproj
2014-05-20 19:29:04 +04:00
..
CameraShift.dpr Up to OpenCV 2.4.9 2014-05-04 15:35:57 +04:00
CameraShift.dproj Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
CameraShift.res Fixed samples MultiDemo 2014-05-20 11:58:18 +06:00