Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 23 Dec 2013 08:45:49 +0000 (12:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 23 Dec 2013 08:45:49 +0000 (12:45 +0400)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge