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

2021-02-27 17:41:57 +00:00

..

android_sdk

Merge pull request #19597 from komakai:android-ndk-camera

2021-02-25 19:14:11 +00:00

generator

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

2021-02-27 17:41:57 +00:00

jar

javadoc: fix generation with OpenJDK 11

2019-10-16 18:14:07 +03:00

jni

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

2019-12-15 11:23:46 +00:00

test

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

2021-02-27 17:41:57 +00:00

check-tests.py

…

CMakeLists.txt

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

2020-04-21 21:32:51 +00:00

common.cmake

…