Delphi-OpenCV/samples
Laentir Valetov 492af1886f Merge branch 'master' of github.com:Laex/Delphi-OpenCV
Conflicts:
	samples/Components/cCameraCapture/cCameraCapture.res
	samples/Components/cCameraCapture/uMainForm.dfm
	samples/Components/cFFmpegIPCamSource/cFFmpegIPCamSource.res
	source/component/Delphi20/dclOpenCV200.res
2014-05-23 22:23:12 +04:00
..
Components Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-23 22:23:12 +04:00
FFMpeg Fixed unit names 2014-05-22 18:45:51 +04:00
LibDemo Fixed unit names 2014-05-22 18:45:51 +04:00
MultiDemo Fixed unit names 2014-05-22 18:45:51 +04:00
opencv_classes FFMpeg IPCam Source 2014-05-23 00:31:51 +04:00
VCLDemo Fixed unit names 2014-05-22 18:45:51 +04:00