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

..

pics

fixed bayer pattern picture in cvtColor() description; corrected formula in getGaussianKernel()

2011-06-14 10:26:24 +00:00

feature_detection.rst

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-13 12:56:39 +04:00

filtering.rst

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-09-10 11:30:19 +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

Normalized file endings.

2013-08-21 18:59:25 +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

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00