Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 Aug 2013 08:43:34 +0000 (12:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 27 Aug 2013 08:43:36 +0000 (12:43 +0400)
1  2 
samples/gpu/CMakeLists.txt

Simple merge