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

Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in

2014-01-20 15:10:19 +04:00

..

pics

Merge remote-tracking branch 'upstream/master'

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

feature_detection.rst

Merge commit '4b885e206' into merge-2.4

2013-12-30 16:48:45 +04:00

filtering.rst

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

2013-11-11 16:55:36 +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-01-20 15:10:19 +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