• 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
..
test_arithm.cpp Loading commit data...
test_countnonzero.cpp Loading commit data...
test_ds.cpp Loading commit data...
test_dxt.cpp Loading commit data...
test_eigen.cpp Loading commit data...
test_io.cpp Loading commit data...
test_main.cpp Loading commit data...
test_mat.cpp Loading commit data...
test_math.cpp Loading commit data...
test_misc.cpp Loading commit data...
test_operations.cpp Loading commit data...
test_precomp.cpp Loading commit data...
test_precomp.hpp Loading commit data...
test_rand.cpp Loading commit data...