• Roman Donchenko's avatar
    Merge commit '43aec5ad^' into merge-2.4 · 4d06c4c7
    Roman Donchenko authored
    Conflicts:
    	modules/contrib/src/inputoutput.cpp
    	modules/gpu/perf/perf_imgproc.cpp
    	modules/gpuarithm/perf/perf_element_operations.cpp
    	modules/gpuarithm/src/element_operations.cpp
    	modules/ts/src/precomp.hpp
    4d06c4c7
Name
Last commit
Last update
..
gpu_perf.cpp Loading commit data...
gpu_test.cpp Loading commit data...
precomp.hpp Loading commit data...
ts.cpp Loading commit data...
ts_arrtest.cpp Loading commit data...
ts_func.cpp Loading commit data...
ts_gtest.cpp Loading commit data...
ts_perf.cpp Loading commit data...