Andrey Kamaev 877dfae044 Fix build of ocl module

2013-03-22 22:14:57 +04:00

..

doc

Merge branch '2.4'

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

include/opencv2

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

perf

Merge branch '2.4'

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

src

Fix build of ocl module

2013-03-22 22:14:57 +04:00

test

Merge branch '2.4'

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

CMakeLists.txt

Move OpenCL SURF to nonfree module

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