• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 9218f497
    Roman Donchenko authored
    Conflicts:
    	modules/contrib/src/retina.cpp
    	modules/gpu/perf/perf_video.cpp
    	modules/gpuoptflow/src/tvl1flow.cpp
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/ocl/perf/perf_calib3d.cpp
    	modules/ocl/perf/perf_color.cpp
    	modules/ocl/perf/perf_match_template.cpp
    	modules/ocl/src/precomp.hpp
    	samples/gpu/stereo_multi.cpp
    9218f497
Name
Last commit
Last update
..
cuda Loading commit data...
bm.cpp Loading commit data...
bm_fast.cpp Loading commit data...
brox.cpp Loading commit data...
farneback.cpp Loading commit data...
interpolate_frames.cpp Loading commit data...
needle_map.cpp Loading commit data...
precomp.cpp Loading commit data...
precomp.hpp Loading commit data...
pyrlk.cpp Loading commit data...
tvl1flow.cpp Loading commit data...