• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · f77c68e0
    Roman Donchenko authored
    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
    f77c68e0
Name
Last commit
Last update
..
OpenCV.mk.in Loading commit data...
OpenCVConfig-version.cmake.in Loading commit data...
OpenCVConfig.cmake.in Loading commit data...
cmake_uninstall.cmake.in Loading commit data...
cvconfig.h.in Loading commit data...
opencv-XXX.pc.in Loading commit data...
opencv_modules.hpp.in Loading commit data...
opencv_run_all_tests_android.sh.in Loading commit data...
opencv_run_all_tests_unix.sh.in Loading commit data...
opencv_testing.sh.in Loading commit data...