Andrey Kamaev 61079547f0 Merge branch '2.4'

2013-02-01 14:59:40 +04:00

..

doc

Merge branch '2.4'

2013-02-01 14:59:40 +04:00

include/opencv2/core

Merge branch '2.4'

2013-02-01 14:59:40 +04:00

perf

Increased time limits, eliminated extra params

2013-01-31 16:18:52 +04:00

src

Merge branch '2.4'

2013-02-01 14:59:40 +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