Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-05-22 19:06:42 +00:00
parent e96a58f091 a9b030591b
commit 21e28adb87
79 changed files with 1054 additions and 46 deletions
@@ -1,6 +1,10 @@
 Introduction to OpenCV Development with Clojure {#tutorial_clojure_dev_intro}
 ===============================================

+@prev_tutorial{tutorial_java_eclipse}
+@next_tutorial{tutorial_android_dev_intro}
+
+
 As of OpenCV 2.4.4, OpenCV supports desktop Java development using nearly the same interface as for
 Android development.