Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Sep 2013 12:46:32 +0000 (16:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Sep 2013 12:46:33 +0000 (16:46 +0400)
1  2 
modules/imgproc/src/smooth.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/test/test_imgproc.cpp

Simple merge
Simple merge