Merge pull request #1762 from jet47:cuda-6.0-npp-fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 11:56:14 +0000 (15:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 11:56:15 +0000 (15:56 +0400)
commitc34fc180a7d08ae89bbdfc837cdb1ad653a236ff
tree28ae081e3054ea816527c65ba7b30c030315b1f6
parent77d04a262249fef5a5ef93e415aa432884d16795
parent95ebdf4069a6333c14e4a610acc37e11cc90a0da
Merge pull request #1762 from jet47:cuda-6.0-npp-fix