Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 20 Feb 2013 08:31:16 +0000 (12:31 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 20 Feb 2013 08:31:16 +0000 (12:31 +0400)
1  2 
modules/core/src/matrix.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/doc/motion_analysis_and_object_tracking.rst

Simple merge