Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 28 Jan 2014 12:31:29 +0000 (16:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 28 Jan 2014 12:31:30 +0000 (16:31 +0400)
1  2 
modules/imgproc/src/pyramids.cpp

Simple merge