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 |
||
---|---|---|
.. | ||
pics | ||
basic_structures.rst | ||
clustering.rst | ||
command_line_parser.rst | ||
core.rst | ||
drawing_functions.rst | ||
dynamic_structures.rst | ||
intro.rst | ||
old_basic_structures.rst | ||
old_xml_yaml_persistence.rst | ||
opengl_interop.rst | ||
operations_on_arrays.rst | ||
utility_and_system_functions_and_macros.rst | ||
xml_yaml_persistence.rst |