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

Browse Source

...

This commit is contained in:

Alexander Alekhin

2018-09-04 19:35:38 +03:00

committed by Alexander Alekhin

parent e0bfe44cac 351ee2e3a5

commit d74b98c3d9

117 changed files with 6913 additions and 3713 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

modules/ts/include/opencv2/ts/ts_gtest.h

+1900 -974

File diff suppressed because it is too large Load Diff