Merge pull request #1917 from alalek:ocl_d3d
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 17 Dec 2013 12:44:26 +0000 (16:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Dec 2013 12:44:27 +0000 (16:44 +0400)
commitbd91b39593696ed570995e95804311645b0f56ae
treeb45ecf07114e7134a758600851daa7566261f009
parent586a5cb6db446d22b248e0f796e8f5032494419c
parent11b9d5bf4d68a9e00680f376662743236f3828c5
Merge pull request #1917 from alalek:ocl_d3d
modules/core/include/opencv2/core/ocl.hpp
modules/core/src/ocl.cpp
modules/core/src/precomp.hpp