• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 6b5ac42a
    Roman Donchenko authored
    Conflicts:
    	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
    	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
    	modules/features2d/doc/object_categorization.rst
    	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
    	modules/gpu/doc/image_filtering.rst
    	modules/gpu/doc/image_processing.rst
    	modules/gpu/doc/video.rst
    	modules/imgproc/doc/miscellaneous_transformations.rst
    	modules/imgproc/doc/object_detection.rst
    	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
    	modules/imgproc/src/samplers.cpp
    	modules/ml/doc/k_nearest_neighbors.rst
    	modules/nonfree/doc/feature_detection.rst
    	modules/ocl/include/opencv2/ocl/ocl.hpp
    	modules/photo/doc/inpainting.rst
    	modules/ts/include/opencv2/ts.hpp
    	platforms/scripts/camera_build.conf
    	samples/android/camera-calibration/AndroidManifest.xml
    6b5ac42a
Name
Last commit
Last update
..
perf_abs.cpp Loading commit data...
perf_addWeighted.cpp Loading commit data...
perf_arithm.cpp Loading commit data...
perf_bitwise.cpp Loading commit data...
perf_compare.cpp Loading commit data...
perf_convertTo.cpp Loading commit data...
perf_dft.cpp Loading commit data...
perf_dot.cpp Loading commit data...
perf_inRange.cpp Loading commit data...
perf_main.cpp Loading commit data...
perf_mat.cpp Loading commit data...
perf_math.cpp Loading commit data...
perf_merge.cpp Loading commit data...
perf_minmaxloc.cpp Loading commit data...
perf_norm.cpp Loading commit data...
perf_precomp.cpp Loading commit data...
perf_precomp.hpp Loading commit data...
perf_reduce.cpp Loading commit data...
perf_split.cpp Loading commit data...
perf_stat.cpp Loading commit data...