Delphi-OpenCV/samples/VCLDemo/vclCameraCapture
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
..
uMainForm.dfm Refactoring 2013-08-11 20:05:35 +04:00
uMainForm.pas Refactoring 2013-08-11 20:05:35 +04:00
VCLCameraCapture.dpr Refactoring 2013-08-11 20:05:35 +04:00
VCLCameraCapture.dproj Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
VCLCameraCapture.res Fixed samples VCLDemo 2014-05-20 12:11:54 +06:00