Alexander Alekhin 3e2b05b096 Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1

2017-03-06 10:22:29 +00:00

..

doc

…

include/opencv2

Fix misplaced description CAP_PROP_SETTINGS and others minor changes in videoio doc

2017-01-26 17:10:32 +01:00

misc/java/test

…

perf

…

src

Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1

2017-03-06 10:22:29 +00:00

test

…

CMakeLists.txt

cmake: append '-framework UIKit' for videoio/imgcodecs module

2017-02-21 13:37:37 +03:00