Alexander Alekhin 0a6f216f83 Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2021-02-21 20:14:09 +00:00

..

doc/pics

squashed #823

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

include/opencv2

Merge pull request #19411 from crackwitz:highgui-pollkey

2021-02-05 20:18:53 +00:00

misc/java

java: disable highgui wrapped code

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

src

highgui(pollKey): properly handle no-GUI case

2021-02-05 23:51:52 +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

2021-02-21 20:14:09 +00:00