[opencv] 32/71: Merge pull request #6885 from alalek:migration2.4

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.1
in repository opencv.

commit bc6d5cc113d64d49483cb9c90e25f81c875f3dda
Merge: 5e4d355 bb5e25b
Author: Maksim Shabunin <maksim.shabunin at itseez.com>
Date:   Mon Jul 18 07:50:03 2016 +0000

    Merge pull request #6885 from alalek:migration2.4

 CONTRIBUTING.md                                          |  2 +-
 cmake/OpenCVPackaging.cmake                              |  2 +-
 cmake/templates/changelog.Debian.in                      |  2 +-
 doc/opencv_cheatsheet.tex                                | 16 ++++++++--------
 .../basic_geometric_drawing/basic_geometric_drawing.rst  |  2 +-
 .../feature_description/feature_description.rst          |  2 +-
 .../feature_flann_matcher/feature_flann_matcher.rst      |  2 +-
 .../corner_subpixeles/corner_subpixeles.rst              |  2 +-
 .../generic_corner_detector/generic_corner_detector.rst  |  2 +-
 .../good_features_to_track/good_features_to_track.rst    |  2 +-
 .../trackingmotion/harris_detector/harris_detector.rst   |  2 +-
 .../imgproc/erosion_dilatation/erosion_dilatation.rst    |  2 +-
 .../gausian_median_blur_bilateral_filter.rst             |  2 +-
 .../histograms/back_projection/back_projection.rst       |  6 +++---
 .../histogram_calculation/histogram_calculation.rst      |  2 +-
 .../histogram_comparison/histogram_comparison.rst        |  2 +-
 .../histogram_equalization/histogram_equalization.rst    |  2 +-
 .../histograms/template_matching/template_matching.rst   |  2 +-
 .../imgproc/imgtrans/canny_detector/canny_detector.rst   |  2 +-
 .../imgproc/imgtrans/copyMakeBorder/copyMakeBorder.rst   |  2 +-
 doc/tutorials/imgproc/imgtrans/filter_2d/filter_2d.rst   |  2 +-
 .../imgproc/imgtrans/hough_circle/hough_circle.rst       |  4 ++--
 .../imgproc/imgtrans/hough_lines/hough_lines.rst         |  4 ++--
 .../imgtrans/laplace_operator/laplace_operator.rst       |  2 +-
 doc/tutorials/imgproc/imgtrans/remap/remap.rst           |  2 +-
 .../imgtrans/sobel_derivatives/sobel_derivatives.rst     |  2 +-
 .../imgproc/imgtrans/warp_affine/warp_affine.rst         |  2 +-
 .../opening_closing_hats/opening_closing_hats.rst        |  2 +-
 doc/tutorials/imgproc/pyramids/pyramids.rst              |  2 +-
 .../bounding_rects_circles/bounding_rects_circles.rst    |  2 +-
 .../bounding_rotated_ellipses.rst                        |  2 +-
 .../shapedescriptors/find_contours/find_contours.rst     |  2 +-
 doc/tutorials/imgproc/shapedescriptors/hull/hull.rst     |  2 +-
 .../imgproc/shapedescriptors/moments/moments.rst         |  2 +-
 .../point_polygon_test/point_polygon_test.rst            |  2 +-
 doc/tutorials/imgproc/threshold/threshold.rst            |  2 +-
 .../introduction/clojure_dev_intro/clojure_dev_intro.rst |  2 +-
 .../crosscompilation/arm_crosscompile_with_cmake.rst     |  6 +++---
 .../introduction/desktop_java/java_dev_intro.rst         |  4 ++--
 .../introduction/display_image/display_image.rst         |  2 +-
 .../how_to_write_a_tutorial/how_to_write_a_tutorial.rst  |  2 +-
 doc/tutorials/introduction/ios_install/ios_install.rst   |  4 ++--
 .../introduction/linux_install/linux_install.rst         |  6 +++---
 .../introduction/windows_install/windows_install.rst     |  4 ++--
 .../objdetect/cascade_classifier/cascade_classifier.rst  |  2 +-
 doc/user_guide/ug_intelperc.rst                          |  2 +-
 doc/user_guide/ug_kinect.rst                             |  2 +-
 modules/core/doc/basic_structures.rst                    |  2 +-
 .../features2d/test/test_lshindex_flannbased_matcher.cpp |  2 +-
 modules/gpu/doc/introduction.rst                         |  2 +-
 .../highgui/doc/reading_and_writing_images_and_video.rst |  2 +-
 modules/highgui/doc/user_interface.rst                   |  2 +-
 modules/highgui/src/cap_libv4l.cpp                       |  2 +-
 modules/highgui/src/cap_v4l.cpp                          |  2 +-
 .../doc/structural_analysis_and_shape_descriptors.rst    |  2 +-
 modules/objdetect/doc/cascade_classification.rst         |  2 +-
 modules/python/test/test_digits.py                       |  2 +-
 modules/python/test/test_gaussian_mix.py                 |  2 +-
 modules/python/test/tests_common.py                      |  4 ++--
 .../cameracalibration/CameraCalibrationActivity.java     |  2 +-
 samples/cpp/facial_features.cpp                          |  4 ++--
 samples/cpp/stereo_calib.cpp                             |  2 +-
 samples/python/chessboard.py                             |  2 +-
 samples/python/cvutils.py                                |  2 +-
 samples/python/demhist.py                                |  2 +-
 samples/python/dft.py                                    |  2 +-
 samples/python/distrans.py                               |  2 +-
 samples/python/edge.py                                   |  2 +-
 samples/python/ffilldemo.py                              |  2 +-
 samples/python/fitellipse.py                             |  2 +-
 samples/python/houghlines.py                             |  2 +-
 samples/python/inpaint.py                                |  2 +-
 samples/python/logpolar.py                               |  2 +-
 samples/python/morphology.py                             |  2 +-
 samples/python/numpy_array.py                            |  2 +-
 samples/python/watershed.py                              |  2 +-
 76 files changed, 96 insertions(+), 96 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git