Roman Donchenko 9dc93ce328 Merge pull request #2176 from SpecLad:merge-2.4		2014-01-20 18:04:56 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
include/opencv2	deleted excess semicolons, commas	2014-01-18 01:31:33 +04:00
perf	added NORM_L2SQR type to cv::norm	2014-01-10 18:45:52 +04:00
src	Merge pull request #2176 from SpecLad:merge-2.4	2014-01-20 18:04:56 +04:00
test	Merge pull request #2176 from SpecLad:merge-2.4	2014-01-20 18:04:56 +04:00
CMakeLists.txt	Merge commit 'ee36717d' into merge-2.4	2013-12-30 16:49:39 +04:00