2d6f35d6ed
Conflicts: modules/gpuwarping/src/cuda/resize.cu modules/gpuwarping/src/resize.cpp modules/gpuwarping/test/test_resize.cpp modules/ocl/perf/main.cpp modules/ocl/perf/perf_calib3d.cpp modules/ocl/perf/perf_canny.cpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_haar.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/perf/perf_precomp.cpp modules/ocl/perf/perf_precomp.hpp |
||
|---|---|---|
| .. | ||
| 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 | ||