• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 95c2e8b5
    Roman Donchenko authored
    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
    95c2e8b5
Name
Last commit
Last update
..
cuda Loading commit data...
precomp.hpp Loading commit data...
pyramids.cpp Loading commit data...
remap.cpp Loading commit data...
resize.cpp Loading commit data...
warp.cpp Loading commit data...