Alexander Alekhin 560f85f8e5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-01-28 14:26:57 +03:00

..

android/java/org/opencv

android: fix javadoc

2020-01-15 19:44:27 +03:00

android-21/java/org/opencv/android

android(camera2): apply .disconnectCamera() patch from issue 13574

2019-12-19 00:29:53 +00:00

src

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

2020-01-28 14:26:57 +03:00

templates

java: generated code to have javadoc

2019-06-05 12:44:03 +02:00

CMakeLists.txt

fixes for old CMake (2.8.12.2)

2018-01-13 02:12:39 +00:00

gen_java.py

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

2020-01-28 14:26:57 +03:00