Andrey Kamaev 0b8a6da817 Merge branch '2.4'		2013-02-22 17:33:30 +04:00
..
doc	Merge branch '2.4'	2013-02-22 17:33:30 +04:00
include/opencv2/core	Merge branch '2.4'	2013-02-22 17:33:30 +04:00
perf	Switched to TEST_CYCLE_MULTIRUN for fast tests	2013-02-20 17:05:54 +04:00
src	Merge branch '2.4'	2013-02-22 17:33:30 +04:00
test	Merge branch '2.4'	2013-02-12 20:30:17 +04:00
CMakeLists.txt	fixed build for CARMA:	2013-01-23 21:05:08 +04:00