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 |
||
---|---|---|
.. | ||
doc | ||
include/opencv2 | ||
perf | ||
src | ||
test | ||
CMakeLists.txt |