Merge pull request #7492 from straywarrior:fix-cudev-headers-with-opencv_world
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Dec 2016 20:20:13 +0000 (20:20 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 1 Dec 2016 20:20:14 +0000 (20:20 +0000)

Trivial merge