feaa12a274
Conflicts: modules/core/include/opencv2/core/version.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/initialization.cpp modules/ocl/test/main.cpp modules/superres/CMakeLists.txt modules/superres/src/input_array_utility.cpp modules/superres/src/input_array_utility.hpp modules/superres/src/optical_flow.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 | ||
| operations_on_arrays.rst | ||
| utility_and_system_functions_and_macros.rst | ||
| xml_yaml_persistence.rst | ||