Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 5 Apr 2019 19:02:24 +0000 (19:02 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 5 Apr 2019 19:08:23 +0000 (19:08 +0000)
commitc9fc27b33731a6dcebf531ff15a0658e4c679482
tree8cf41a446b47de895dc9f8e82d5af67e8b813151
parentaa1359dc19e8c9ed0fdb1518c8c5d4478ff89e66
parent28925572f619fbfca2cec8704413414ad4a0411a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
12 files changed:
doc/CMakeLists.txt
doc/tutorials/calib3d/camera_calibration_pattern/camera_calibration_pattern.markdown
doc/tutorials/gpu/gpu-basics-similarity/gpu_basics_similarity.markdown
doc/tutorials/introduction/android_binary_package/O4A_SDK.markdown
doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.markdown
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.markdown
doc/tutorials/ml/non_linear_svms/non_linear_svms.markdown
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/src/tensorflow/tf_graph_simplifier.hpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/imgcodecs/src/grfmt_tiff.cpp
samples/cpp/matchmethod_orb_akaze_brisk.cpp