95c2e8b51f
Conflicts: .gitignore doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst modules/gpu/src/match_template.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_precomp.hpp |
||
---|---|---|
.. | ||
etc | ||
img | ||
src | ||
tutorial | ||
colormaps.rst | ||
facerec_api.rst | ||
facerec_changelog.rst | ||
facerec_tutorial.rst | ||
index.rst |