Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Oct 2018 03:21:47 +0000 (03:21 +0000)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 2 Oct 2018 11:31:05 +0000 (14:31 +0300)
commit690fb0544c5847dbd6122deb705009abf29818a8
tree63f3e5d245d24ebddba3238b1cf504f520c74cb8
parentae4c72a153a0f99b957eef090055530df5f2577d
parentee0c985491fe1d7af2d40eb626638aae67f46e64
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
doc/CMakeLists.txt
doc/tutorials/imgproc/pyramids/pyramids.markdown
modules/core/src/ocl.cpp
modules/core/src/system.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/matchers.cpp
modules/js/src/embindgen.py
modules/objdetect/src/hog.cpp
platforms/ios/build_framework.py
platforms/js/build_js.py