Merge pull request #2790 from akarsakov:ocl_pyrUp_unroll
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 20 Jun 2014 13:49:14 +0000 (13:49 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 20 Jun 2014 13:49:14 +0000 (13:49 +0000)
1  2 
modules/imgproc/src/pyramids.cpp

Simple merge