Merge pull request #1698 from ilya-lavrenov:ocl_warp
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 28 Oct 2013 14:59:08 +0000 (18:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Oct 2013 14:59:08 +0000 (18:59 +0400)

Trivial merge