fee2ed37fc
Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp |
||
---|---|---|
.. | ||
ocl | ||
test_arithm.cpp | ||
test_countnonzero.cpp | ||
test_ds.cpp | ||
test_dxt.cpp | ||
test_eigen.cpp | ||
test_io.cpp | ||
test_main.cpp | ||
test_mat.cpp | ||
test_math.cpp | ||
test_misc.cpp | ||
test_operations.cpp | ||
test_precomp.hpp | ||
test_ptr.cpp | ||
test_rand.cpp | ||
test_umat.cpp |