Roman Donchenko 3d7a457c97 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	doc/tutorials/introduction/linux_install/linux_install.rst
	modules/core/doc/operations_on_arrays.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/system.cpp
	modules/gpu/src/cuda/resize.cu
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/video/src/bgfg_gaussmix2.cpp

2014-05-19 18:39:20 +04:00

..

pics

Merge remote-tracking branch 'upstream/master'

2013-09-26 23:08:23 +10:00

feature_detection.rst

Change Canny input image description, we can use multichannel image now

2014-04-07 14:26:48 +04:00

filtering.rst

removed ABF

2014-01-31 19:15:40 +04:00

geometric_transformations.rst

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

2014-05-19 18:39:20 +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-05-19 18:39:20 +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

2014-05-19 18:39:20 +04:00