• 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
..
main.cpp Loading commit data...
perf_arithm.cpp Loading commit data...
perf_bgfg.cpp Loading commit data...
perf_blend.cpp Loading commit data...
perf_brute_force_matcher.cpp Loading commit data...
perf_calib3d.cpp Loading commit data...
perf_canny.cpp Loading commit data...
perf_color.cpp Loading commit data...
perf_fft.cpp Loading commit data...
perf_filters.cpp Loading commit data...
perf_gemm.cpp Loading commit data...
perf_gftt.cpp Loading commit data...
perf_haar.cpp Loading commit data...
perf_hog.cpp Loading commit data...
perf_hough.cpp Loading commit data...
perf_imgproc.cpp Loading commit data...
perf_match_template.cpp Loading commit data...
perf_matrix_operation.cpp Loading commit data...
perf_moments.cpp Loading commit data...
perf_norm.cpp Loading commit data...
perf_opticalflow.cpp Loading commit data...
perf_precomp.hpp Loading commit data...
perf_pyramid.cpp Loading commit data...
perf_split_merge.cpp Loading commit data...