mirror of
https://github.com/opencv/opencv.git
synced 2024-11-25 19:50:38 +08:00
4cf9990d4e
Conflicts: doc/tutorials/definitions/noContent.rst doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst modules/core/include/opencv2/core/core.hpp modules/core/include/opencv2/core/internal.hpp modules/core/include/opencv2/core/version.hpp modules/gpu/CMakeLists.txt modules/highgui/perf/perf_output.cpp modules/highgui/test/test_video_io.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/main.cpp modules/ocl/src/hog.cpp modules/ocl/src/initialization.cpp modules/ocl/src/moments.cpp modules/ocl/src/opencl/moments.cl modules/ocl/test/main.cpp modules/ocl/test/test_moments.cpp modules/python/test/test.py modules/ts/include/opencv2/ts/ts_perf.hpp modules/ts/src/precomp.hpp modules/ts/src/ts_perf.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 | ||