Merge pull request #924 from pengx17:2.4_arithm_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 30 May 2013 08:01:25 +0000 (12:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 30 May 2013 08:01:25 +0000 (12:01 +0400)
1  2 
modules/ocl/src/arithm.cpp
modules/ocl/src/imgproc.cpp

Simple merge
Simple merge