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

2020-12-09 18:09:00 +00:00

..

android/java/org/opencv

…

android-21/java/org/opencv/android

android: use protected fields in JavaCamera2View

2020-12-08 05:18:21 +00:00

src

…

templates

…

CMakeLists.txt

…

gen_java.py

java: workaround handling of base class

2020-11-16 06:03:30 +00:00