• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 4f2b126b
    Roman Donchenko authored
    Conflicts:
    	modules/core/include/opencv2/core/version.hpp
    	modules/core/src/out.cpp
    	modules/cudaimgproc/test/test_hough.cpp
    	modules/gpu/doc/introduction.rst
    	modules/gpu/perf/perf_imgproc.cpp
    	modules/gpu/src/generalized_hough.cpp
    	modules/nonfree/perf/perf_main.cpp
    4f2b126b
Name
Last commit
Last update
..
calib3d.rst Loading commit data...
cuda.rst Loading commit data...
data_structures.rst Loading commit data...
initalization_and_information.rst Loading commit data...
introduction.rst Loading commit data...
object_detection.rst Loading commit data...