Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 May 2013 10:21:49 +0000 (14:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 15 May 2013 10:21:50 +0000 (14:21 +0400)
commit7d9041460a6dc3b064f96748454987fe4672f316
treea7d50beed7931824596d0d47d27e630a62c1e159
parent4d866ea32e19993c6fb2343363d440cd82ce91d6
parentd053f2165d12e6044b51a713c0b586a5cf2d6f27
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
modules/ocl/include/opencv2/ocl/ocl.hpp