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-31 14:42:00 +04:00
include/opencv2	Merge pull request #2478 from clemenscorny:master	2014-03-26 12:19:54 +04:00
perf	Merge pull request #2487 from ilya-lavrenov:tapi_perf_orb	2014-03-31 18:17:50 +04:00
src	Merge pull request #2480 from vpisarev:ocl_orb	2014-03-14 19:04:19 +04:00
test	cv::norm -> cvtest::norm in tests	2014-04-08 14:49:20 +04:00
CMakeLists.txt	Normalized file endings.	2013-08-21 18:59:25 +04:00