Ilya Lavrenov aa5326c231 cv::norm -> cvtest::norm in tests ... Conflicts: modules/core/src/stat.cpp		2014-04-08 14:49:20 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +04:00
include/opencv2	added jpeg with optimized coding support.	2014-03-27 13:34:33 -04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
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	Merge pull request #1986 from GregoryMorse:patch-3	2014-03-18 16:18:33 +04:00