Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

2013-08-27 13:26:44 +04:00

..

pics

Corrected a mistake in CHI2 kernel in line 354 and line 362 svm.cpp

2013-02-22 15:43:41 +01:00

boosting.rst

Fix several inconsistent declarations identified by check_doc2 script

2013-02-19 16:22:20 +04:00

decision_trees.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

ertrees.rst

Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)

2012-05-30 11:13:07 +00:00

expectation_maximization.rst

Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)

2012-05-30 11:13:07 +00:00

gradient_boosted_trees.rst

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

k_nearest_neighbors.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

ml.rst

added doc on CvERTrees

2011-08-09 09:52:08 +00:00

mldata.rst

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

neural_networks.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

normal_bayes_classifier.rst

Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)

2012-05-30 11:13:07 +00:00

random_trees.rst

Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)

2012-05-30 11:13:07 +00:00

statistical_models.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00

support_vector_machines.rst

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

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