Alexander Alekhin 1537a5f253 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-04-09 19:19:20 +00:00

..

doc/pics

squashed #823

2015-04-24 21:58:14 +02:00

include/opencv2

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-09-05 14:29:22 +03:00

misc/java

java: disable highgui wrapped code

2018-01-13 02:12:39 +00:00

src

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2020-04-09 19:19:20 +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