Merge branch 'master' into gpu-cuda-rename
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Wed, 11 Sep 2013 05:41:23 +0000 (09:41 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Wed, 11 Sep 2013 05:41:23 +0000 (09:41 +0400)
commit6bbac2a7d930d7a63506a87f3d110904c2407856
treefa8cdf6b1f59825e916eb76e57370935cb43571c
parent1036ce807ca3afe92905a85f4627fef75bee0738
parentacc2ca484c257142a4e459e3ee822591c5a6c98e
Merge branch 'master' into gpu-cuda-rename
cmake/OpenCVModule.cmake
modules/ocl/test/utility.cpp