mirror of
https://github.com/opencv/opencv.git
synced 2024-12-16 10:29:11 +08:00
4f2b126b7b
Conflicts: modules/core/include/opencv2/core/version.hpp modules/core/src/out.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/doc/introduction.rst modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/generalized_hough.cpp modules/nonfree/perf/perf_main.cpp |
||
|---|---|---|
| .. | ||
| etc | ||
| img | ||
| src | ||
| tutorial | ||
| colormaps.rst | ||
| facerec_api.rst | ||
| facerec_changelog.rst | ||
| facerec_tutorial.rst | ||
| index.rst | ||