projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc64a40
7285341
)
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
author
Andrey Pavlenko
<andrey.pavlenko@itseez.com>
Fri, 25 Oct 2013 15:47:38 +0000
(19:47 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Fri, 25 Oct 2013 15:47:38 +0000
(19:47 +0400)
1
2
modules/ocl/src/optical_flow_farneback.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/superres/src/opencl/superres_btvl1.cl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/ocl/src/optical_flow_farneback.cpp
Simple merge
diff --cc
modules/superres/src/opencl/superres_btvl1.cl
Simple merge
projects / platform / upstream / opencv.git / commitdiff