Alexander Alekhin c9fc27b337 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-04-05 19:08:23 +00:00
..
images
android_dev_intro.markdown
android_ocl_intro.markdown	documentation: avoid links to 'master' branch from 3.4 maintenance branch	2018-05-31 16:45:18 +03:00
dev_with_OCV_on_Android.markdown
O4A_SDK.markdown	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-04-05 19:08:23 +00:00