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
|
9cf4f80746
|
Fixed samples MultiDemo
Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
|
2014-05-20 11:58:18 +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
|
bd967a4572
|
Upgrade to version OpenCV 2.4.6
Signed-off-by: Laex <laex@bk.ru>
|
2013-07-06 17:20:17 +04:00 |
|
Laex
|
8070464750
|
Added sample - two cameras
Signed-off-by: Laex <laex@bk.ru>
|
2013-06-08 00:35:04 +04:00 |
|