• 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...
test_arithm.cpp Loading commit data...
test_bgfg.cpp Loading commit data...
test_blend.cpp Loading commit data...
test_brute_force_matcher.cpp Loading commit data...
test_calib3d.cpp Loading commit data...
test_canny.cpp Loading commit data...
test_color.cpp Loading commit data...
test_fft.cpp Loading commit data...
test_filters.cpp Loading commit data...
test_gemm.cpp Loading commit data...
test_hough.cpp Loading commit data...
test_imgproc.cpp Loading commit data...
test_kmeans.cpp Loading commit data...
test_match_template.cpp Loading commit data...
test_matrix_operation.cpp Loading commit data...
test_moments.cpp Loading commit data...
test_norm.cpp Loading commit data...
test_objdetect.cpp Loading commit data...
test_optflow.cpp Loading commit data...
test_precomp.hpp Loading commit data...
test_pyramids.cpp Loading commit data...
test_sort.cpp Loading commit data...
test_split_merge.cpp Loading commit data...
utility.cpp Loading commit data...
utility.hpp Loading commit data...