Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 13:15:55 +0000 (17:15 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 4 Feb 2013 13:15:55 +0000 (17:15 +0400)
commitc527340cb6c13cbd67ab5498c528910f4956a3f9
treeb32758ded19a6b00faaffd30b4dc726d25ec655b
parent4d785fff997dda9a120948d4697eec3d853a72e1
parentf608df96402087da75b2a9fa2cf5430ac4d1e711
Merge branch 2.4
apps/traincascade/boost.cpp
modules/core/src/matrix.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/src/brisk.cpp
modules/gpu/src/cascadeclassifier.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/ml/src/boost.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp