Merge pull request #576 from bitwangyaoyao:2.4_customMat2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 27 Feb 2013 15:33:53 +0000 (19:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Feb 2013 15:33:54 +0000 (19:33 +0400)
commit0a8711d76b737384aae26e737f830633cf395865
treef035d2c97c668e62b37ebff46e55dc86a091b4a4
parentaf13c8604d0a8c0ed685f4e99bd7f045a50e6cea
parentcbff75db9eeaf748001a46096ad93c8033edcab8
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/initialization.cpp