fee2ed37fc
Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp |
||
|---|---|---|
| .. | ||
| _static | ||
| _themes/blue | ||
| pattern_tools | ||
| py_tutorials | ||
| tutorials | ||
| user_guide | ||
| vidsurv | ||
| acircles_pattern.png | ||
| check_docs2.py | ||
| check_docs_whitelist.txt | ||
| check_docs.py | ||
| CMakeLists.txt | ||
| conf.py | ||
| Doxyfile.in | ||
| haartraining.htm | ||
| license.txt | ||
| mymath.sty | ||
| ocv.py | ||
| opencv_cheatsheet.tex | ||
| opencv-logo2.png | ||
| opencv-logo-white.png | ||
| opencv-logo.png | ||
| opencv.bib | ||
| opencv.ico | ||
| opencv.jpg | ||
| packaging.txt | ||
| patch_refman_latex.py | ||
| pattern.png | ||
| reformat.py | ||
