Commit Graph

8 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
Laex
91909414e2 Added samples
Signed-off-by: Laex <laex@bk.ru>
2013-10-30 22:26:57 +04:00
Laex
fcdf5b42b5 Adding samples
Signed-off-by: Laex <laex@bk.ru>
2013-09-25 23:18:23 +04:00
Laex
cc870d718d Refactoring
Signed-off-by: Laex <laex@bk.ru>
2013-08-11 20:27:42 +04:00
Laex
c11e66affe Refactoring
Signed-off-by: Laex <laex@bk.ru>
2013-08-11 20:05:35 +04:00