projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
586a5cb
11b9d5b
)
Merge pull request #1917 from alalek:ocl_d3d
author
Andrey Pavlenko
<andrey.pavlenko@itseez.com>
Tue, 17 Dec 2013 12:44:26 +0000
(16:44 +0400)
committer
OpenCV Buildbot
<buildbot@opencv.org>
Tue, 17 Dec 2013 12:44:27 +0000
(16:44 +0400)
1
2
modules/core/include/opencv2/core/ocl.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/core/src/ocl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/core/src/precomp.hpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/core/include/opencv2/core/ocl.hpp
Simple merge
diff --cc
modules/core/src/ocl.cpp
Simple merge
diff --cc
modules/core/src/precomp.hpp
Simple merge