Commit Graph

7 Commits

Author SHA1 Message Date
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
Laentir Valetov
ef8f3ae457 Components/ComponentsDemo.groupproj
Signed-off-by: Laentir Valetov <laex@bk.ru>
2014-05-20 19:20:29 +04:00
Mikhail Grigorev
63c81cbcd2 Fixed samples VCLDemo
Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
2014-05-20 12:11:54 +06:00
Laentir Valetov
63e2cd08b0 Up to OpenCV 2.4.9
Signed-off-by: Laentir Valetov <laex@bk.ru>
2014-05-04 15:35:57 +04:00
Mikhail Grigorev
debc764ad0 Fix vclOpenCVandOpenGL samples
Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
2013-11-28 11:15:59 +06:00
Laex
91909414e2 Added samples
Signed-off-by: Laex <laex@bk.ru>
2013-10-30 22:26:57 +04:00
Laex
78726756b4 Example with OpenGL
Signed-off-by: Laex <laex@bk.ru>
2013-10-06 13:48:40 +04:00