Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 21 Dec 2012 13:58:48 +0000 (17:58 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 21 Dec 2012 13:58:48 +0000 (17:58 +0400)
commit962884cdec1767e832b3364227fcb9479c36c354
tree5f0d8e75cfc853e638b81d8e28d1ac9ab98015bb
parent3edf7c5386bbd3777138c09406518f41a6c071ac
parentffdbddd6b1c7be94b0bc42cf436601a3a51ab518
Merge branch 2.4
CMakeLists.txt
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/user_guide/ug_mat.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/persistence.cpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/objdetect/perf/perf_cascadeclassifier.cpp
modules/ts/src/ts_perf.cpp