• 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
..
Mat.cpp Loading commit data...
common.h Loading commit data...
converters.cpp Loading commit data...
converters.h Loading commit data...
core_manual.cpp Loading commit data...
core_manual.hpp Loading commit data...
features2d_manual.hpp Loading commit data...
jni_part.cpp Loading commit data...
utils.cpp Loading commit data...