projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4b8bab
632452c
)
Merge pull request #1687 from bitwangyaoyao:2.4_fix
author
Andrey Pavlenko
<andrey.pavlenko@itseez.com>
Tue, 29 Oct 2013 07:03:33 +0000
(11:03 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Tue, 29 Oct 2013 07:03:34 +0000
(11:03 +0400)
1
2
modules/ocl/perf/perf_brute_force_matcher.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ocl/src/opencl/brute_force_match.cl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/ocl/perf/perf_brute_force_matcher.cpp
Simple merge
diff --cc
modules/ocl/src/opencl/brute_force_match.cl
Simple merge