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)
commitc6f6f9ab35026968875a8a04affdd39e4c71538d
tree7c64e9ae53475b941ac977a330e3a252099c2d5b
parent6503836b4d0cb36d7270bb8f34c8fe8749417b62
parent9613135e8dad2a1beed03d190b5f9facf2f55f7f
Merge pull request #451 from bitwangyaoyao:2.4_operator
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp