propagated some fixes from 2.3 to trunk
authorVadim Pisarevsky <no@email>
Thu, 23 Jun 2011 12:00:09 +0000 (12:00 +0000)
committerVadim Pisarevsky <no@email>
Thu, 23 Jun 2011 12:00:09 +0000 (12:00 +0000)
commit49467947ac6d4e31dba2d2a6c040239716d0af21
tree2132e8b5e76a172b9accda43af737787b85323be
parentd4fbb2c4fb146540326dee81e1022f98b44b3921
propagated some fixes from 2.3 to trunk
26 files changed:
modules/androidcamera/CMakeLists.txt
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/core/doc/operations_on_arrays.rst
modules/core/doc/xml_yaml_persistence.rst
modules/core/include/opencv2/core/version.hpp
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst
modules/features2d/doc/drawing_function_of_keypoints_and_matches.rst
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/CMakeLists.txt
modules/highgui/CMakeLists.txt
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/highgui/doc/user_interface.rst
modules/highgui/src/cap_dshow.cpp
modules/highgui/src/cap_ffmpeg.cpp
modules/highgui/src/cap_qtkit.mm
modules/highgui/src/window_cocoa.mm
modules/imgproc/doc/feature_detection.rst
modules/imgproc/doc/filtering.rst
modules/imgproc/doc/geometric_transformations.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/ml/doc/decision_trees.rst
modules/python/test/test.py