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
|
2d1b78a820
|
Update OpenCV Component
Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>
|
2014-05-20 10:02:43 +06:00 |
|
Laentir Valetov
|
7edf1d9684
|
Refactoring directory structure
Signed-off-by: Laentir Valetov <laex@bk.ru>
|
2014-05-19 23:29:48 +04:00 |
|