• Roman Donchenko's avatar
    Merge commit '43aec5ad' into merge-2.4 · 2c4bbb31
    Roman Donchenko authored
    Conflicts:
    	cmake/OpenCVConfig.cmake
    	cmake/OpenCVLegacyOptions.cmake
    	modules/contrib/src/retina.cpp
    	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
    	modules/gpu/doc/video.rst
    	modules/gpu/src/speckle_filtering.cpp
    	modules/python/src2/cv2.cv.hpp
    	modules/python/test/test2.py
    	samples/python/watershed.py
    2c4bbb31
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...