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 |
||
|---|---|---|
| .. | ||
| adaptive_bilateral_filter.cpp | ||
| bgfg_segm.cpp | ||
| clahe.cpp | ||
| CMakeLists.txt | ||
| facedetect.cpp | ||
| hog.cpp | ||
| pyrlk_optical_flow.cpp | ||
| squares.cpp | ||
| stereo_match.cpp | ||
| surf_matcher.cpp | ||
| tvl1_optical_flow.cpp | ||