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 |
||
|---|---|---|
| .. | ||
| ABI_compat_generator.py | ||
| camera_build.conf | ||
| cmake_android_all_cameras.py | ||
| cmake_android_arm.sh | ||
| cmake_android_mips.sh | ||
| cmake_android_service.sh | ||
| cmake_android_x86.sh | ||
| cmake_arm_gnueabi_hardfp.sh | ||
| cmake_arm_gnueabi_softfp.sh | ||
| cmake_carma.sh | ||
| cmake_winrt.cmd | ||