Roman Donchenko 0a2d22bf31 Merge remote-tracking branch 'origin/2.4' into merge-2.4		2014-05-26 12:32:14 +04:00
..
doc	DescriptorExtractor: added defaultNorm() to return default norm type.	2013-12-09 09:54:42 -02:00
include/opencv2	some more changes	2014-02-17 21:57:33 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-05-26 12:32:14 +04:00
test	cv2cvtest part2	2014-04-09 13:08:51 +04:00
CMakeLists.txt	Making all dependencies from highgui module optional	2012-06-26 07:29:36 +00:00