Andrey Kamaev 8c41c614eb Merge pull request #700 from cuda-geek/fix_build_with_cuda ...

fix master build with CUDA after latest 2.4 merge

2013-03-25 03:27:31 -07:00

..

doc

Fix build errors

2013-03-21 18:37:34 +04:00

include/opencv2

Merge branch '2.4'

2013-03-21 23:11:54 +04:00

perf

fixed build with CUDA after latest merge

2013-03-25 08:08:36 +04:00

src

Merge pull request #700 from cuda-geek/fix_build_with_cuda

2013-03-25 03:27:31 -07:00

test

fixed build with CUDA after latest merge

2013-03-25 08:08:36 +04:00

CMakeLists.txt

Move OpenCL SURF to nonfree module

2013-03-21 17:59:35 +04:00