opencv

History

Roman Donchenko 6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml

2013-08-13 12:56:39 +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

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

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

ertrees.rst

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