projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
13875b5
6ad4823
)
Merge pull request #2217 from ilya-lavrenov:tapi_superres
author
Andrey Pavlenko
<andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 10:38:59 +0000
(14:38 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Mon, 3 Feb 2014 10:38:59 +0000
(14:38 +0400)
1
2
modules/core/include/opencv2/core/opencl/ocl_defs.hpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/core/include/opencv2/core/opencl/ocl_defs.hpp
Simple merge
projects / profile / ivi / opencv.git / commitdiff