Resolving conflicts after rebasing from public
[profile/ivi/opencv.git] / modules / matlab /
drwxr-xr-x   ..
-rw-r--r-- 13339 CMakeLists.txt
-rw-r--r-- 2162 LICENSE
-rw-r--r-- 16797 README.md
-rw-r--r-- 1958 compile.cmake
drwxr-xr-x - generator
drwxr-xr-x - include
drwxr-xr-x - test