• 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
..
vtk Loading commit data...
clouds.cpp Loading commit data...
precomp.hpp Loading commit data...
shapes.cpp Loading commit data...
types.cpp Loading commit data...
viz3d.cpp Loading commit data...
vizcore.cpp Loading commit data...
vizimpl.cpp Loading commit data...
vizimpl.hpp Loading commit data...
widget.cpp Loading commit data...