Roman Donchenko 4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/include/opencv2/core/version.hpp modules/core/src/out.cpp modules/cudaimgproc/test/test_hough.cpp modules/gpu/doc/introduction.rst modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/generalized_hough.cpp modules/nonfree/perf/perf_main.cpp		2014-04-07 14:59:34 +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-04-07 14:59:34 +04:00
test	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
CMakeLists.txt	Making all dependencies from highgui module optional	2012-06-26 07:29:36 +00:00