Commit Graph

6 Commits

Author SHA1 Message Date
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
Laentir Valetov
7e602e92f0 Components/ComponentsDemo.groupproj
Signed-off-by: Laentir Valetov <laex@bk.ru>
2014-05-20 19:20:29 +04:00
Mikhail Grigorev
3423b9b9c1 Fixed samples MultiDemo
Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
2014-05-20 11:58:18 +06:00
Laentir Valetov
7b8f5b2ee5 Up to OpenCV 2.4.9
Signed-off-by: Laentir Valetov <laex@bk.ru>
2014-05-04 15:35:57 +04:00
Laex
96638f5969 Added samples
Signed-off-by: Laex <laex@bk.ru>
2013-10-30 22:26:57 +04:00
Laex
d7d35e71a1 Adding samples
Signed-off-by: Laex <laex@bk.ru>
2013-09-25 23:18:23 +04:00