Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher

a9103606 · Vadim Pisarevsky · OpenCV Buildbot · c865b282 · 82b98548 · a9103606
Commit a9103606 authored Mar 01, 2013 by Vadim Pisarevsky Committed by OpenCV Buildbot Mar 01, 2013
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

brute_force_matcher.cpp modules/ocl/src/brute_force_matcher.cpp +0 -0

brute_force_match.cl modules/ocl/src/kernels/brute_force_match.cl +0 -0

No files found.
--- a/modules/ocl/src/brute_force_matcher.cpp
+++ b/modules/ocl/src/brute_force_matcher.cpp
--- a/modules/ocl/src/kernels/brute_force_match.cl
+++ b/modules/ocl/src/kernels/brute_force_match.cl