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

Browse Source

...

This commit is contained in:

Alexander Alekhin

2020-08-06 14:15:52 +00:00

parent dbab8d8c38 1067cd0649

commit fa25faa2d2

52 changed files with 1498 additions and 319 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

doc/py_tutorials/py_setup/images/opencv_logo.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 5.2 KiB