• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 3939d783
    Roman Donchenko authored
    Conflicts:
    	modules/core/include/opencv2/core/types_c.h
    	modules/gpu/src/cuda/imgproc.cu
    	modules/gpu/src/cuda/safe_call.hpp
    	modules/gpu/src/error.cpp
    	modules/gpu/src/imgproc.cpp
    	modules/imgproc/src/distransform.cpp
    	modules/imgproc/src/shapedescr.cpp
    	modules/python/src2/cv2.cpp
    	modules/python/src2/cv2.cv.hpp
    3939d783
Name
Last commit
Last update
..
Mat.cpp Loading commit data...
VideoCapture.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...