• 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
..
cv.h Loading commit data...
cv.hpp Loading commit data...
cvaux.h Loading commit data...
cvaux.hpp Loading commit data...
cvwimage.h Loading commit data...
cxcore.h Loading commit data...
cxcore.hpp Loading commit data...
cxeigen.hpp Loading commit data...
cxmisc.h Loading commit data...
highgui.h Loading commit data...
ml.h Loading commit data...