• 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
..
test_approxpoly.cpp Loading commit data...
test_bilateral_filter.cpp Loading commit data...
test_boundingrect.cpp Loading commit data...
test_canny.cpp Loading commit data...
test_color.cpp Loading commit data...
test_connectedcomponents.cpp Loading commit data...
test_contours.cpp Loading commit data...
test_convhull.cpp Loading commit data...
test_cvtyuv.cpp Loading commit data...
test_distancetransform.cpp Loading commit data...
test_emd.cpp Loading commit data...
test_filter.cpp Loading commit data...
test_floodfill.cpp Loading commit data...
test_grabcut.cpp Loading commit data...
test_histograms.cpp Loading commit data...
test_houghLines.cpp Loading commit data...
test_imgwarp.cpp Loading commit data...
test_imgwarp_strict.cpp Loading commit data...
test_lsd.cpp Loading commit data...
test_main.cpp Loading commit data...
test_moments.cpp Loading commit data...
test_pc.cpp Loading commit data...
test_precomp.hpp Loading commit data...
test_templmatch.cpp Loading commit data...
test_thresh.cpp Loading commit data...
test_watershed.cpp Loading commit data...