9d8d70d6ca
Conflicts: doc/tutorials/definitions/tocDefinitions.rst modules/core/include/opencv2/core/core.hpp modules/core/src/system.cpp modules/features2d/src/freak.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_context.cpp modules/ocl/test/test_api.cpp |
||
---|---|---|
.. | ||
noContent.rst | ||
README.txt | ||
tocDefinitions.rst |
Include in this directory only defintion files. None of the reST files entered here will be parsed by the Sphinx Builder.