Alexander Alekhin ea5499fa51 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-10-29 20:46:51 +00:00
..
android/java/org/opencv	Fix modules/ typos	2019-08-16 17:34:29 +03:00
android-21/java/org/opencv/android	android: use .getRowStride() in JavaCamera2View	2019-10-28 18:45:56 +00:00
src	android: use .getRowStride() in JavaCamera2View	2019-10-28 18:45:56 +00:00
templates
CMakeLists.txt
gen_java.py	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-06-07 19:02:55 +03:00