• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · a3bde36c
    Roman Donchenko authored
    Conflicts:
    	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
    	modules/contrib/doc/facerec/facerec_api.rst
    	modules/contrib/include/opencv2/contrib/contrib.hpp
    	modules/contrib/src/facerec.cpp
    	modules/core/include/opencv2/core/mat.hpp
    	modules/features2d/include/opencv2/features2d/features2d.hpp
    	modules/highgui/src/loadsave.cpp
    	modules/imgproc/src/pyramids.cpp
    	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
    	modules/python/src2/gen.py
    	modules/python/test/test.py
    	modules/superres/test/test_superres.cpp
    	samples/cpp/facerec_demo.cpp
    a3bde36c
Name
Last commit
Last update
..
opencl Loading commit data...
test_affine3.cpp Loading commit data...
test_affine3d_estimator.cpp Loading commit data...
test_cameracalibration.cpp Loading commit data...
test_cameracalibration_artificial.cpp Loading commit data...
test_cameracalibration_badarg.cpp Loading commit data...
test_chessboardgenerator.cpp Loading commit data...
test_chessboardgenerator.hpp Loading commit data...
test_chesscorners.cpp Loading commit data...
test_chesscorners_badarg.cpp Loading commit data...
test_chesscorners_timing.cpp Loading commit data...
test_compose_rt.cpp Loading commit data...
test_cornerssubpix.cpp Loading commit data...
test_fisheye.cpp Loading commit data...
test_fundam.cpp Loading commit data...
test_homography.cpp Loading commit data...
test_main.cpp Loading commit data...
test_modelest.cpp Loading commit data...
test_posit.cpp Loading commit data...
test_precomp.hpp Loading commit data...
test_reproject_image_to_3d.cpp Loading commit data...
test_solvepnp_ransac.cpp Loading commit data...
test_stereomatching.cpp Loading commit data...
test_undistort.cpp Loading commit data...
test_undistort_badarg.cpp Loading commit data...
test_undistort_points.cpp Loading commit data...