Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 31 Oct 2013 10:03:36 +0000 (14:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 31 Oct 2013 10:03:36 +0000 (14:03 +0400)

Trivial merge