Delphi-OpenCV/samples/Components
Laentir Valetov 90d6fccbb6 Merge branch 'master' of github.com:Laex/Delphi-OpenCV
Conflicts:
	component/uOCVCamera.pas
	samples/Components/cCameraCapture/uMainForm.dfm
	samples/Components/cCameraCapture/uMainForm.pas
2014-05-09 01:33:52 +04:00
..
cCameraCapture Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-09 01:33:52 +04:00