Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 25 Oct 2012 11:32:48 +0000 (15:32 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 25 Oct 2012 11:32:48 +0000 (15:32 +0400)
commit729d76ad09490dfb913c58152c2a3347b384ccd2
treeb698b2e6bdb393baab7c0aabafdc7a267b9cf9a2
parent772586801bcd50b0a3ce99c92754c2e14e596079
parentbbb2d27addadd3b87b643fc13b4ee899811645af
Merge branch '2.4'
modules/core/include/opencv2/core/core.hpp
modules/core/src/algorithm.cpp