• Vladislav Vinogradov's avatar
    Merge branch 'master' into gpu-cuda-rename · 1036ce80
    Vladislav Vinogradov authored
    Conflicts:
    	modules/core/include/opencv2/core/cuda.hpp
    	modules/cudaimgproc/src/gftt.cpp
    	modules/objdetect/include/opencv2/objdetect/erfilter.hpp
    	modules/objdetect/src/erfilter.cpp
    	modules/superres/perf/perf_superres.cpp
    	modules/superres/src/btv_l1_cuda.cpp
    	modules/superres/src/optical_flow.cpp
    	modules/videostab/src/global_motion.cpp
    	modules/videostab/src/inpainting.cpp
    	samples/cpp/stitching_detailed.cpp
    	samples/cpp/videostab.cpp
    	samples/gpu/stereo_multi.cpp
    1036ce80
Name
Last commit
Last update
..
pics Loading commit data...
basic_structures.rst Loading commit data...
clustering.rst Loading commit data...
command_line_parser.rst Loading commit data...
core.rst Loading commit data...
drawing_functions.rst Loading commit data...
dynamic_structures.rst Loading commit data...
intro.rst Loading commit data...
old_basic_structures.rst Loading commit data...
old_xml_yaml_persistence.rst Loading commit data...
opengl_interop.rst Loading commit data...
operations_on_arrays.rst Loading commit data...
utility_and_system_functions_and_macros.rst Loading commit data...
xml_yaml_persistence.rst Loading commit data...