Merge pull request #2665 from ilya-lavrenov:ipp_filter2d
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 7 May 2014 15:17:56 +0000 (19:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 7 May 2014 15:17:57 +0000 (19:17 +0400)
1  2 
modules/imgproc/src/filter.cpp

Simple merge