Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp		2014-03-03 13:45:22 +04:00
..
pics	Merge remote-tracking branch 'upstream/master'	2013-09-26 23:08:23 +10:00
feature_detection.rst	Added optional constraints to non-probablistic hough lines functions	2014-01-15 13:22:56 -08:00
filtering.rst	removed ABF	2014-01-31 19:15:40 +04:00
geometric_transformations.rst	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
histograms.rst	Merge pull request #1248 from vkocheganov:chi_square_alt	2013-08-28 11:44:41 +04:00
imgproc.rst	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
motion_analysis_and_object_tracking.rst	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
object_detection.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00