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)
1  2 
doc/tutorials/core/adding_images/adding_images.rst
modules/ocl/src/filtering.cpp
modules/ocl/src/initialization.cpp

Simple merge
Simple merge