Merge pull request #3278 from akarsakov:ocl_houghlines_perf_test
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 30 Sep 2014 10:49:14 +0000 (10:49 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 30 Sep 2014 10:49:14 +0000 (10:49 +0000)

Trivial merge