Merge pull request #6448 from alalek:merge-2.4

Browse Source

...

This commit is contained in:

Alexander Alekhin

2016-04-25 16:56:51 +00:00

parent 5ed4e1b887 67a734ce73

commit 6e5e5d87df

10 changed files with 86 additions and 75 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

samples/data/tree.avi

BIN

Binary file not shown.