Merge pull request #1929 from alalek:ocl_haar_amd_beta
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 10:56:47 +0000 (14:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 10:56:47 +0000 (14:56 +0400)

Trivial merge