Merge pull request #700 from cuda-geek/fix_build_with_cuda
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 25 Mar 2013 10:27:31 +0000 (03:27 -0700)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 25 Mar 2013 10:27:31 +0000 (03:27 -0700)
commit8c41c614ebd5156d932d0841f75257f1c60aa6b6
tree59e8189a3cfc26fd36b0d13a3bb9cad266d7af38
parent04eabf8d9fd5794dcbc2f3e497507300e2876bda
parentdd9e786a8ea8d428afece3bc01205ced2d2d8086
Merge pull request #700 from cuda-geek/fix_build_with_cuda

fix master build with CUDA after latest 2.4 merge