Alexander Alekhin 560f85f8e5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-01-28 14:26:57 +03:00
..
android_sdk	Merge pull request #16349 from hannesa2:RemoveEclipseRelicts	2020-01-16 16:53:06 +00:00
generator	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-01-28 14:26:57 +03: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	Remove Android Eclipse relicts	2019-12-24 07:38:12 +01:00
check-tests.py	print() is a function in Python 3	2018-05-03 07:12:12 +02:00
CMakeLists.txt	android: gradle-based package and samples	2018-12-19 14:59:48 +03:00
common.cmake	Merge pull request #12264 from dkurt:dnn_remove_forward_method	2018-09-06 13:26:47 +03:00