• 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
..
bioinspired Loading commit data...
calib3d Loading commit data...
core Loading commit data...
definitions Loading commit data...
features2d Loading commit data...
general/table_of_content_general Loading commit data...
gpu Loading commit data...
highgui Loading commit data...
images Loading commit data...
imgproc Loading commit data...
introduction Loading commit data...
ios Loading commit data...
ml Loading commit data...
objdetect Loading commit data...
video/table_of_content_video Loading commit data...
tutorials.rst Loading commit data...