Andrey Kamaev 1ca8f33b4e Merge branch '2.4'

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

..

doc

Merge branch '2.4'

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

include/opencv2

Merge branch '2.4'

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

perf

Merge branch '2.4'

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

src

Merge branch '2.4'

2013-03-21 23:11:54 +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