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 |
||
---|---|---|
.. | ||
ug_features2d.rst | ||
ug_highgui.rst | ||
ug_intelperc.rst | ||
ug_mat.rst | ||
ug_traincascade.rst | ||
user_guide.rst |