Merged the trunk r8324:8345
authorAndrey Kamaev <no@email>
Fri, 18 May 2012 12:59:40 +0000 (12:59 +0000)
committerAndrey Kamaev <no@email>
Fri, 18 May 2012 12:59:40 +0000 (12:59 +0000)
commit70166820ead0a1dae37db543a39b270614ce579a
tree4ea8a3edbf74711960f1472b8c01650c41d72e61
parentaebed446b16149aa024eea631f70778fbf8cbc4d
Merged the trunk r8324:8345
CMakeLists.txt
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/perf/perf_convertTo.cpp
modules/core/src/matmul.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/ts/CMakeLists.txt
modules/video/include/opencv2/video/video.hpp
samples/gpu/performance/performance.cpp