Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: .gitignore doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst modules/gpu/src/match_template.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_precomp.hpp		2013-09-10 11:30:19 +04:00
..
data_structures.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
feature_detection_and_description.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
image_filtering.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-10 11:30:19 +04:00
image_processing.rst	War on Whitespace, master edition: file endings.	2013-08-27 14:23:26 +04:00
introduction.rst	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
matrix_reductions.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00
object_detection.rst	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
ocl.rst	fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)	2012-10-31 15:15:51 +04:00
operations_on_matrices.rst	Deleted all trailing whitespace.	2013-08-21 18:59:24 +04:00
structures_and_utility_functions.rst	Normalized file endings.	2013-08-21 18:59:25 +04:00