projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
22b0ea1
2eca75c
)
Merge branch 'kepler-optimization' into cuda-dev
author
Vladislav Vinogradov
<vlad.vinogradov@itseez.com>
Tue, 27 Nov 2012 12:34:45 +0000
(16:34 +0400)
committer
Vladislav Vinogradov
<vlad.vinogradov@itseez.com>
Tue, 27 Nov 2012 12:34:45 +0000
(16:34 +0400)
1
2
modules/gpu/include/opencv2/gpu/gpu.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/gpu/perf/perf_imgproc.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/gpu/src/cuda/bf_knnmatch.cu
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/gpu/include/opencv2/gpu/gpu.hpp
Simple merge
diff --cc
modules/gpu/perf/perf_imgproc.cpp
Simple merge
diff --cc
modules/gpu/src/cuda/bf_knnmatch.cu
Simple merge