Andrey Pavlenko a3668f1369 changing default perf strategy from BASIC (old) to SIMPLE (new, faster)		2014-03-21 18:29:06 +04:00
..
include/opencv2	eliminated restriction src[i].channels() == 1 in cv::merge	2014-03-19 13:56:31 +04:00
misc	Merge pull request #2432 from ilya-lavrenov:summary_py	2014-03-04 11:46:29 +04:00
src	changing default perf strategy from BASIC (old) to SIMPLE (new, faster)	2014-03-21 18:29:06 +04:00
CMakeLists.txt	Merge commit '60906d917' into merge-2.4	2013-12-30 16:47:05 +04:00