Delphi-OpenCV/samples/MultiDemo
Laentir Valetov 67b694fc50 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
..
Augmented reality Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
CameraCalibrate Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
CameraCaptureFindContours Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
CameraShift Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
CarNumDetect Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
FaceDetect Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
FaceDetectAndLockWorkstation Components/ComponentsDemo.groupproj 2014-05-20 19:20:29 +04:00
fback Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
FrameRecon Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
HandsDetect Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
Hello World Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
IPCamVideoCapture Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
minarea Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
mmdt Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
MotionDetect Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
ObjectTracking Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
Squares Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
Stereo Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
TrackColor Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
TwoCameras Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
VideoProcessing Merge branch 'master' of github.com:Laex/Delphi-OpenCV 2014-05-20 19:29:04 +04:00
MultiDemo.groupproj Up to OpenCV 2.4.9 2014-05-04 15:35:57 +04:00