Merge pull request #451 from bitwangyaoyao:2.4_operator
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 18 Feb 2013 14:04:44 +0000 (18:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Feb 2013 14:04:44 +0000 (18:04 +0400)
1  2 
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp

Simple merge