Ilya Lavrenov aa5326c231 cv::norm -> cvtest::norm in tests ... Conflicts: modules/core/src/stat.cpp		2014-04-08 14:49:20 +04:00
..
doc
include/opencv2
perf
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-31 14:42:00 +04:00
test	cv::norm -> cvtest::norm in tests	2014-04-08 14:49:20 +04:00
CMakeLists.txt