Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sun, 24 Feb 2013 16:16:41 +0000 (20:16 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Sun, 24 Feb 2013 16:16:53 +0000 (20:16 +0400)
commitdddd285d3bfe25dda11870018b3d2f22451e76f7
tree4cc23df63ca6b1d5762c58edb45c1c60b63b1dda
parent0b8a6da817942ea2d6b107d40ea13da7cc828cef
parent620c6994560513ac809a365ff223df85fc48331f
Merge branch 2.4
doc/tutorials/core/adding_images/adding_images.rst
modules/ocl/src/filtering.cpp
modules/ocl/src/initialization.cpp