Alexander Alekhin 0105f8fa38 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2020-11-20 20:32:00 +00:00
..
doc/pics
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-11-20 20:32:00 +00:00
misc/java
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2020-10-02 15:58:45 +00:00
test	Restored 500ms delay in highgui test	2018-12-03 14:34:29 +03:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-12-16 21:30:30 +00:00