3c4b24d531
Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp |
||
---|---|---|
.. | ||
cmake_uninstall.cmake.in | ||
cvconfig.h.in | ||
opencv_modules.hpp.in | ||
opencv-XXX.pc.in | ||
OpenCV.mk.in | ||
OpenCVConfig-version.cmake.in | ||
OpenCVConfig.cmake.in |