Andrey Kamaev 7572b4d400 Merge branch '2.4'

2013-01-30 15:12:50 +04:00

..

doc

Merge branch 2.4

2013-01-17 18:39:20 +04:00

include/opencv2/core

Merge branch '2.4'

2013-01-30 15:12:50 +04:00

perf

increased time-limits

2012-11-28 18:17:33 +04:00

src

Merge branch '2.4'

2013-01-30 15:12:50 +04:00

test

Merge branch '2.4'

2013-01-30 15:12:50 +04:00

CMakeLists.txt

fixed build for CARMA:

2013-01-23 21:05:08 +04:00