Merge pull request #2034 from pentschev:ocl_features2d_orb_master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 27 Dec 2013 11:49:27 +0000 (15:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 27 Dec 2013 11:49:28 +0000 (15:49 +0400)
commit80816f68f355a0264f4568e38e90a4ed300887c0
tree67522c22ae130633eeb8bd4bf40e121c7438318f
parent5c25d821b1df41ef24c48caf52a7d9a4de48cba5
parent07c5e33023596803dbb1a9a5c050de3d1ed6af7a
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
modules/ocl/include/opencv2/ocl.hpp