Merge pull request #2259 from ilya-lavrenov:ocl_surf
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 10:24:36 +0000 (14:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 10:24:36 +0000 (14:24 +0400)
commita1ad1f0800cb7e1b54739ac448bbb216738aa85a
treee942471cbe6e986c8fb9b6d3794d72d3a754a840
parent2bef73c9688547c18f0a76ef07462edfe701e71b
parentede5b23753f9946ba107237a3eaae006afd82b4f
Merge pull request #2259 from ilya-lavrenov:ocl_surf