Andrey Kamaev 13b6a3a15e Merge branch 2.4		2012-12-24 17:10:07 +04:00
..
doc	Merge release 2.4.3	2012-11-02 17:58:02 +04:00
include/opencv2/core	Merge branch 2.4	2012-12-24 17:10:07 +04:00
perf	increased time-limits	2012-11-28 18:17:33 +04:00
src	Merge branch 2.4	2012-12-24 17:10:07 +04:00
test	Merge branch 2.4	2012-11-13 19:54:48 +04:00
CMakeLists.txt	fixed build for CARMA platform	2012-12-13 13:49:32 +04:00