Alexander Alekhin 18cbfa4a4f Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2023-01-23 00:11:12 +00:00
..
android_sdk	android: drop sourceCompatibility/targetCompatibility options	2021-10-06 16:49:02 +00:00
generator	Update CameraBridgeViewBase error message	2022-03-22 15:40:23 -04: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	2023-01-23 00:11:12 +00:00
check-tests.py	Merge pull request #20367 from augustinmanecy:features2d-rw	2022-12-21 16:03:00 +03:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-04-21 21:32:51 +00:00
common.cmake	Merge pull request #12264 from dkurt:dnn_remove_forward_method	2018-09-06 13:26:47 +03:00