f77c68e0fa
Conflicts: modules/imgproc/src/opencl/integral_sqrsum.cl modules/nonfree/doc/feature_detection.rst modules/nonfree/include/opencv2/nonfree/ocl.hpp modules/nonfree/src/surf_ocl.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/match_template.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/opencl/haarobjectdetect_scaled2.cl modules/ocl/test/test_imgproc.cpp |
||
---|---|---|
.. | ||
cmake_uninstall.cmake.in | ||
cvconfig.h.in | ||
opencv_modules.hpp.in | ||
opencv_run_all_tests_android.sh.in | ||
opencv_run_all_tests_unix.sh.in | ||
opencv_testing.sh.in | ||
opencv-XXX.pc.in | ||
OpenCV.mk.in | ||
OpenCVConfig-version.cmake.in | ||
OpenCVConfig.cmake.in |