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 |
||
|---|---|---|
| .. | ||
| images | ||
| camera_calibration_and_3D_reconstruction.rst | ||
| data_structures.rst | ||
| feature_detection_and_description.rst | ||
| image_filtering.rst | ||
| image_processing.rst | ||
| introduction.rst | ||
| matrix_reductions.rst | ||
| ml_machine_learning.rst | ||
| object_detection.rst | ||
| ocl.rst | ||
| operations_on_matrices.rst | ||
| structures_and_utility_functions.rst | ||
| video_analysis.rst | ||