Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 4 Jun 2018 16:24:09 +0000 (19:24 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 4 Jun 2018 16:26:10 +0000 (19:26 +0300)
commit45dd575ed2c8458181cd0dd286fa22d1061a4065
tree95227989861e3e19d6a715907c30229398441eb4
parent80709697e53f452454dc11e2b35d92cf9e736380
parentb2cff44084b91c781d86b98bd2c99f90191a4ea1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecbbd9f37b09663ccfa8899a839f95ec6.

Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f1858024899b02854bb9adbed7303378ddd2eb48.
24 files changed:
CMakeLists.txt
cmake/OpenCVDetectInferenceEngine.cmake
cmake/OpenCVFindLibsPerf.cmake
cmake/OpenCVFindLibsVideo.cmake
doc/tutorials/features2d/feature_description/feature_description.markdown
doc/tutorials/features2d/feature_detection/feature_detection.markdown
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.markdown
doc/tutorials/features2d/feature_homography/feature_homography.markdown
doc/tutorials/features2d/trackingmotion/corner_subpixels/corner_subpixels.markdown
doc/tutorials/features2d/trackingmotion/generic_corner_detector/generic_corner_detector.markdown
doc/tutorials/features2d/trackingmotion/good_features_to_track/good_features_to_track.markdown
doc/tutorials/features2d/trackingmotion/harris_detector/harris_detector.markdown
doc/tutorials/viz/launching_viz/launching_viz.markdown
modules/calib3d/src/calibinit.cpp
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/include/opencv2/core/types.hpp
modules/core/src/arithm.cpp
modules/features2d/src/fast.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/videoio/CMakeLists.txt
modules/videoio/src/videoio_registry.cpp
modules/viz/include/opencv2/viz/widgets.hpp
samples/dnn/README.md