Merge pull request #2275 from ElenaGvozdeva:ocl_matchTemplate
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 4 Feb 2014 12:32:11 +0000 (16:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Feb 2014 12:32:11 +0000 (16:32 +0400)

Trivial merge