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
..
facerec	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-07 14:59:34 +04:00
contrib.rst	last warnings solved	2013-06-13 07:36:37 +02:00
openfabmap.rst	Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong	2013-08-07 14:49:33 +02:00
stereo.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00