mirror of
https://github.com/opencv/opencv.git
synced 2024-12-06 02:29:14 +08:00
4036f6a3d0
Conflicts: apps/CMakeLists.txt modules/contrib/CMakeLists.txt modules/core/include/opencv2/core/version.hpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/java/generator/gen_java.py modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_runtime/cl_runtime.cpp modules/ocl/src/columnsum.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/test/main.cpp modules/ocl/test/test_color.cpp modules/ocl/test/test_imgproc.cpp samples/gpu/CMakeLists.txt |
||
---|---|---|
.. | ||
cmake_uninstall.cmake.in | ||
cvconfig.h.cmake | ||
opencv_modules.hpp.in | ||
opencv-XXX.pc.cmake.in | ||
OpenCV.mk.in | ||
OpenCVConfig-version.cmake.in | ||
OpenCVConfig.cmake.in |