Merge pull request #1954 from pentschev:ocl_features2d_fast_master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 12 Dec 2013 13:37:09 +0000 (17:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Dec 2013 13:37:09 +0000 (17:37 +0400)
commitb43d6b68587bb222bb3e98ffd1b2b205cc9d93be
treed1f8928c679ffdbfb87e5c940afc91550914b45f
parent5299b13434b2ff3e2679abed1c79367f84c497b6
parent41bec1b11210fc835537171efceba064795236c8
Merge pull request #1954 from pentschev:ocl_features2d_fast_master
modules/ocl/include/opencv2/ocl.hpp