Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
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
2014-07-08 14:33:56 +04:00
..
2013-08-21 18:59:25 +04:00
2014-05-19 18:39:20 +04:00
2013-12-16 15:02:12 +04:00
2013-12-03 17:35:21 +04:00
2013-08-21 18:59:25 +04:00
2013-08-21 18:59:24 +04:00
2013-08-27 14:23:26 +04:00
2014-01-20 22:51:33 +04:00
2014-03-24 19:02:16 +04:00
2014-07-08 14:33:56 +04:00
2013-10-28 13:38:25 +04:00
2014-05-19 18:39:20 +04:00
2013-12-03 17:35:21 +04:00
2013-09-26 19:02:35 +04:00
2014-04-07 14:59:34 +04:00
2014-01-20 22:51:33 +04:00
2014-04-07 14:59:34 +04:00