Andrey Kamaev 1ca8f33b4e Merge branch '2.4'

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

..

doc

Merge branch '2.4'

2013-02-20 12:31:16 +04:00

include/opencv2

Merge branch '2.4'

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

perf

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

src

Merge branch '2.4'

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

test

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

CMakeLists.txt

merged gpunonfree and nonfree module

2013-03-18 16:14:37 +04:00